[pkg-bacula-commits] [bacula] 02/03: Merge branch 'master' into master-systemd

[Sven Hartge]

This is an automated email from the git hooks/post-receive script.

hartge-guest pushed a commit to branch master-systemd
in repository bacula.

commit a3bae9ed13421e01a574a74dda40bd200d54ce92
Merge: 0bc8ef5 963fa7f
Author: Sven Hartge <sven at svenhartge.de>
Date:   Thu Jul 14 18:45:18 2016 +0200

    Merge branch 'master' into master-systemd

 debian/TODO                             |  2 +-
 debian/changelog                        |  3 ++-
 debian/scripts/install-dbconfig-upgrade | 11 -----------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --cc debian/changelog
index 6193fde,72b9c0f..45aa2f1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,9 +1,17 @@@
 +bacula (7.4.2+dfsg-3) UNRELEASED; urgency=medium
 +
 +  [ Sven Hartge ] 
 +  * Enable systemd integration
 +  * Change bacula-{sd,fd,director}.services to non-forking simple mode
 +
 + -- Sven Hartge <sven at svenhartge.de>  Tue, 14 Jul 2016 11:36:12 +0200
 +
- bacula (7.4.2+dfsg-2) UNRELEASED; urgency=medium
+ bacula (7.4.2+dfsg-2) unstable; urgency=medium
  
    * Fix MySQL database creation via dbconfig-common (Closes: #830999)
+   * Really fix PostgreSQL upgrades
  
 - --
 + -- Carsten Leonhardt <leo at debian.org>  Mon, 14 Jul 2016 01:16:50 +0200
  
  bacula (7.4.2+dfsg-1) unstable; urgency=low
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git