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

[Alexander Wirt]

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

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

commit fc8e36dd6d37ce523f720b389b2e285988bce85b
Merge: 3f05829 fc2eaae
Author: Alexander Wirt <formorer at debian.org>
Date:   Mon Apr 20 17:46:51 2015 +0200

    Merge branch 'master' into ubuntu-noma
    
    Conflicts:
    	debian/changelog

 debian/changelog                    |  9 ++++++++-
 debian/patches/fix_upstream_version | 11 +++++++++++
 debian/patches/series               |  1 +
 debian/tests/control                |  3 +++
 debian/tests/version                | 18 ++++++++++++++++++
 5 files changed, 41 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 02bbd1c,daacb59..1376ca8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
- icinga2 (2.3.4-1~ppa1~saucy1) saucy; urgency=medium
++icinga2 (2.3.4-2~ppa1~saucy1) saucy; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Mon, 01 Dec 2014 22:39:28 +0100
 +
+ icinga2 (2.3.4-2) unstable; urgency=medium
+ 
+   * [54904c5] Fix upstream version in icinga2 --version
+   * [3bb3712] Add first autopkgtest (dep8) support
+ 
+  -- Alexander Wirt <formorer at debian.org>  Mon, 20 Apr 2015 17:19:39 +0200
+ 
  icinga2 (2.3.4-1) unstable; urgency=medium
  
    [ Achim Ledermüller ]

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