[Pkg-nagios-changes] [pkg-icingaweb2] 02/02: Merge branch 'master' into ubuntu

[Alexander Wirt]

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

formorer pushed a commit to branch ubuntu
in repository pkg-icingaweb2.

commit b8a5e5c897215339256c1e35d2437992a3c5cebc
Merge: 0877ed9 f084559
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Jul 17 10:29:57 2016 +0200

    Merge branch 'master' into ubuntu

 debian/changelog                  | 11 ++++++++++-
 debian/control                    |  7 +++++--
 debian/icingacli.install          |  1 +
 debian/icingaweb2-common.postinst |  6 +++++-
 debian/icingaweb2.install         |  1 -
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index e2bcb3c,1fe858e..5720db3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
- icingaweb2 (2.3.4-1~ppa1) xenial; urgency=medium
++icingaweb2 (2.3.4-2~ppa1) xenial; urgency=medium
 +
 +  * Rebuild for my ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Tue, 21 Jun 2016 07:00:34 +0200
 +
+ icingaweb2 (2.3.4-2) unstable; urgency=medium
+ 
+   * [a7f069b] Re-add www-data to icingaweb2 group (Closes: #831530)
+   * [3c63052] Recommend some optional modules (Closes: #831440)
+   * [cc5c7b5] Move bash completion to icingacli package (Closes: #830938)
+   * [5a3d014] Fix group and permissions of modules directory
+ 
+  -- Alexander Wirt <formorer at debian.org>  Sun, 17 Jul 2016 10:13:36 +0200
+ 
  icingaweb2 (2.3.4-1) unstable; urgency=medium
  
    * Imported Upstream version 2.3.4

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