[Pkg-nagios-changes] [pkg-lconf] 07/08: Merge branch 'master' into debmon-wheezy

[Markus Frosch]

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

lazyfrosch-guest pushed a commit to branch debmon-wheezy
in repository pkg-lconf.

commit f36fc91d43005fc5206952d9e8668339c80d1e0a
Merge: 047e397 6dcc70c
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Wed Feb 26 12:31:27 2014 +0100

    Merge branch 'master' into debmon-wheezy
    
    Conflicts:
    	debian/changelog

 debian/changelog                    | 11 +++++++
 debian/control                      |  8 ++---
 debian/install                      |  1 +
 debian/links                        |  1 +
 debian/patches/11_hostgroup_aliases | 58 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 debian/rules                        | 10 ++++++-
 7 files changed, 85 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 932328b,3007ba7..529bdd0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,14 +1,21 @@@
+ lconf (1.3.0-1~preview+1) unstable; urgency=medium
+ 
+   * [dc8973b] Fixed Vcs-Browser
+   * [8c59a00] Added patch 11_hostgroup_aliases
+   * [73dc4a6] Suggesting icinga-web-lconf
+   * [721400a] Added LConfDeploy.sh to package
+   * [a59c6eb] Removed host1, host2, host3 from example config.pm
+   * [f261ed3] Bumped standards to 3.9.5
+ 
+  -- Markus Frosch <markus at lazyfrosch.de>  Wed, 26 Feb 2014 12:30:05 +0100
+ 
 +lconf (1.3.0-1~preview+0~debmon7+1) debmon-wheezy; urgency=low
 +
 +  * Rebuild for debmon-wheezy
 +  * [028f056] Added gbp.conf for debmon-wheezy
 +
 + -- Markus Frosch <markus at lazyfrosch.de>  Fri, 06 Sep 2013 16:34:15 +0200
 +
  lconf (1.3.0-1~preview+0) unstable; urgency=low
  
    * Initial release (Closes: #721983)

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