[Pkg-nagios-changes] [pkg-icinga2] 01/04: 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 1b1a42d4f623338e1a6bafa85aff0d14fc64cfaa
Merge: 7268104 2bd4dee
Author: Alexander Wirt <alexander.wirt at credativ.de>
Date:   Mon Feb 13 22:58:28 2017 +0100

    Merge branch 'master' into ubuntu

 ChangeLog                 | 11 +++++++++++
 RELEASE.md                | 39 ++++++---------------------------------
 debian/changelog          | 13 +++++++------
 doc/1-about.md            | 11 +++++++++++
 icinga2.spec              |  2 +-
 lib/config/configitem.cpp | 13 +++----------
 6 files changed, 39 insertions(+), 50 deletions(-)

diff --cc debian/changelog
index 9908535,ecaa506..23652c6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,9 +1,15 @@@
- icinga2 (2.6.1-1~ppa1~trusty2) trusty; urgency=medium
++icinga2 (2.6.2-1~ppa1~trusty1) trusty; urgency=medium
 +
-   * [4b87bb3] Readd systemd service file
++  * Rebuild for my ubuntu ppa
 +
-  -- Alexander Wirt <formorer at debian.org>  Wed, 08 Feb 2017 13:17:59 +0100
++ -- Alexander Wirt <alexander.wirt at credativ.de>  Mon, 13 Feb 2017 22:58:22 +0100
 +
- icinga2 (2.6.1-1~ppa1~trusty1) trusty; urgency=medium
+ icinga2 (2.6.2-1~exp1) experimental; urgency=medium
  
-   * Rebuild for my ubuntu ppa
+   * [16eb968] Depend on network.target and fix typo in service deps
+   * [7eee479] New upstream version 2.6.2
  
-  -- Alexander Wirt <alexander.wirt at credativ.de>  Tue, 03 Jan 2017 08:20:19 +0100
+  -- Alexander Wirt <alexander.wirt at credativ.de>  Mon, 13 Feb 2017 20:50:38 +0100
  
  icinga2 (2.6.1-1~exp1) experimental; urgency=medium
  

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