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

[Sven Hartge]

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

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

commit 03ed1ebddacd134665c35b9de358515ca014f020
Merge: e57c08c 3a11b5b
Author: Sven Hartge <sven at svenhartge.de>
Date:   Mon Jul 18 15:40:31 2016 +0200

    Merge branch 'master-systemd' into systemd-fixuser

 debian/changelog                            | 6 +++---
 debian/patches/fix-mysql55-sql-syntax.patch | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index b1eea30,59b18a1..e5d1755
--- a/debian/changelog
+++ b/debian/changelog
@@@ -7,16 -7,10 +7,16 @@@ bacula (7.4.3+dfsg-2) UNRELEASED; urgen
      bacula-director-common to bacula-director-DBTYPE, simplyfying their
      handling for the packaging tools.
    * readd lost tmpfiles.d/bacula.conf to create /var/run/bacula
 +  * remove configuration option to change runtime user for director
 +    and storage daemon
 +  * add capability cap_dac_read_search to bacula-fd, making it possible
 +    to run as non-root in the future.
 +  * change bacula-fd init-script to make running as non-root configurable
 +    by the admin via /etc/default/bacula-fd
  
-  -- Sven Hartge <sven at svenhartge.de>  Tue, 18 Jul 2016 13:07:12 +0200
+  -- Sven Hartge <sven at svenhartge.de>  Tue, 18 Jul 2016 23:59:59 +0200
  
- bacula (7.4.3+dfsg-1) unstable; urgency=low
+ bacula (7.4.3+dfsg-1) unstable; urgency=medium
  
    * New upstream release
    * Fix MySQL database creation via dbconfig-common (Closes: #830999)

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