[Pkg-nagios-changes] [pkg-icinga2] 01/06: 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-icinga2.

commit 273489e42f8d686a68e0108f3bd28185e679fc3a
Merge: cc8be45 4c3bc2a
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed Aug 31 15:42:34 2016 +0200

    Merge branch 'master' into ubuntu

 ChangeLog                        |  6 ++++++
 RELEASE.md                       | 28 +++++++++++++++++++---------
 debian/changelog                 |  9 ++++++++-
 debian/control                   |  4 ++--
 doc/1-about.md                   |  6 ++++++
 icinga2.nuspec                   |  2 +-
 icinga2.spec                     |  2 +-
 lib/checker/checkercomponent.cpp |  4 ++++
 tools/chocolateyInstall.ps1      |  4 ++--
 9 files changed, 49 insertions(+), 16 deletions(-)

diff --cc debian/changelog
index 38bf71a,adb6262..b40611e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
- icinga2 (2.5.3-1~ppa1~wily1) wily; urgency=medium
++icinga2 (2.5.4-1~ppa1~wily1) wily; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Thu, 19 May 2016 14:38:41 +0200
 +
+ icinga2 (2.5.4-1) unstable; urgency=medium
+ 
+   * [7cf17d9] Recommend specific icinga-doc version
+   * [d2c5d89] New upstream version 2.5.4
+ 
+  -- Alexander Wirt <formorer at debian.org>  Wed, 31 Aug 2016 10:31:34 +0200
+ 
  icinga2 (2.5.3-1) unstable; urgency=medium
  
    * [6cd83c4] Imported Upstream version 2.5.3

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