[Pkg-nagios-changes] [pkg-icinga2] 01/04: Merge branch 'master' into ubuntu
Alexander Wirt
formorer at debian.org
Mon Dec 1 21:45:39 UTC 2014
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 f18f2ce6767d939ee9a5cb6654c31aae50a0d26f
Merge: bb6d51c 316724a
Author: Alexander Wirt <formorer at debian.org>
Date: Mon Dec 1 22:39:39 2014 +0100
Merge branch 'master' into ubuntu
Conflicts:
debian/changelog
debian/icinga2-common.icinga2.service
debian/rules
AUTHORS | 3 +
ChangeLog | 40 +++++
INSTALL.md | 4 +-
agent/windows-setup-agent/SetupWizard.cs | 9 +-
debian/changelog | 40 ++---
debian/classicui/apache2.conf | 12 +-
debian/icinga2-bin.postinst | 41 +++++
.../{icinga2-common.postrm => icinga2-bin.postrm} | 10 +-
debian/icinga2-classicui.postinst | 2 +-
debian/icinga2-common.install | 2 +-
debian/icinga2-common.postinst | 12 --
debian/icinga2-common.postrm | 3 -
debian/rules | 4 +
doc/1-about.md | 40 +++++
doc/2-getting-started.md | 2 +-
doc/3-troubleshooting.md | 2 +-
doc/4-monitoring-basics.md | 169 ++++++++++++++++-----
doc/5-monitoring-remote-systems.md | 2 -
doc/6-addons-plugins.md | 4 +-
doc/7-configuring-icinga-2.md | 34 ++++-
doc/CMakeLists.txt | 2 +-
doc/icinga2-prepare-dirs.8 | 28 ----
doc/icinga2.8 | 56 ++++---
etc/CMakeLists.txt | 26 +++-
etc/icinga/icinga-classic-apache.conf.cmake | 28 ++--
etc/icinga2/conf.d/hosts.conf | 2 +-
etc/icinga2/conf.d/satellite.conf | 8 +-
etc/icinga2/conf.d/{ => win32}/hosts.conf | 6 +-
etc/icinga2/win32/constants.conf | 24 +++
etc/initsystem/CMakeLists.txt | 4 +-
etc/initsystem/icinga2.init.d.cmake | 21 ++-
etc/initsystem/icinga2.service.cmake | 2 +-
.../{icinga2-prepare-dirs => prepare-dirs} | 16 +-
icinga2.spec | 27 ++--
itl/command-plugins.conf | 31 +++-
lib/base/json.cpp | 1 +
lib/base/stream.hpp | 5 +
lib/base/tlsutility.cpp | 2 +-
lib/cli/nodesetupcommand.cpp | 2 +-
lib/cli/nodeupdateconfigcommand.cpp | 8 +-
lib/cli/nodeutility.cpp | 19 +++
lib/cli/nodeutility.hpp | 1 +
lib/config/expression.cpp | 2 +-
lib/icinga/host.cpp | 2 +-
lib/icinga/host.hpp | 2 +-
lib/icinga/icinga-type.conf | 2 +
lib/icinga/icingaapplication.cpp | 2 +-
lib/icinga/icingaapplication.hpp | 2 +-
lib/icinga/macroprocessor.cpp | 51 ++++---
lib/icinga/macroprocessor.hpp | 6 +-
lib/icinga/macroresolver.hpp | 2 +-
lib/icinga/pluginutility.cpp | 74 ++++++++-
lib/icinga/pluginutility.hpp | 5 +-
lib/icinga/service.cpp | 2 +-
lib/icinga/service.hpp | 2 +-
lib/methods/clrchecktask.cpp | 12 +-
lib/methods/clusterchecktask.cpp | 3 +
lib/methods/clusterzonechecktask.cpp | 6 +-
lib/methods/icingachecktask.cpp | 3 +
lib/methods/nullchecktask.cpp | 3 +
lib/methods/randomchecktask.cpp | 3 +
lib/perfdata/gelfwriter.cpp | 2 +-
lib/perfdata/graphitewriter.cpp | 20 ++-
lib/perfdata/graphitewriter.hpp | 1 +
lib/perfdata/perfdatawriter.cpp | 12 +-
lib/perfdata/perfdatawriter.hpp | 1 +
lib/remote/apilistener-sync.cpp | 1 +
plugins/check_disk.cpp | 6 +-
plugins/check_load.cpp | 19 ++-
plugins/check_users.cpp | 6 +-
plugins/thresholds.cpp | 22 +--
test/CMakeLists.txt | 4 +-
.../randomchecktask.cpp => test/icinga-macros.cpp | 47 +++---
73 files changed, 771 insertions(+), 308 deletions(-)
diff --cc debian/changelog
index 650e3cf,1c6ddb5..dcfc991
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,32 -1,26 +1,32 @@@
- icinga2 (2.2.0-1~ppa1~vivid6) vivid; urgency=medium
++icinga2 (2.2.1-1~ppa1~trusty1) trusty; urgency=medium
+
- * lower dpkg version in pre-depends
-
- -- Alexander Wirt <formorer at debian.org> Fri, 21 Nov 2014 23:40:05 +0100
-
- icinga2 (2.2.0-1~ppa1~trusty5) trusty; urgency=medium
-
- * Rebuild for trusty
-
- -- Alexander Wirt <formorer at debian.org> Fri, 21 Nov 2014 16:18:44 +0100
-
- icinga2 (2.2.0-1~ppa1~vivid3) vivid; urgency=medium
++ * Rebuild for my ubuntu ppa
+
- * remove unused systemd files
++ -- Alexander Wirt <formorer at debian.org> Mon, 01 Dec 2014 22:39:28 +0100
+
- -- Alexander Wirt <formorer at debian.org> Fri, 21 Nov 2014 16:10:39 +0100
+ icinga2 (2.2.1-1) unstable; urgency=medium
- icinga2 (2.2.0-1~ppa1~vivid2) vivid; urgency=medium
+ [ Alexander Wirt ]
+ * [e73d057] Links are tested with -L
+ * [d605522] Just to be safe, use -e to check for the old apache configfile.
+ (Closes: #770743)
+ * [05f8f54] Move enable-feature to icinga2-bin (Closes: #770534)
+ * [c6fd841] Imported Upstream version 2.2.1
+ * [1135583] Add is_fresh_install to icinga2-bin postinst
+ * [1deb08b] icinga2-prepare-dirs was renamed to prepare-dirs
- * No systemd for ubuntu
+ [ Gunnar Beutner ]
+ * [c3d13b5] Fix support for Apache 2.4
- -- Alexander Wirt <formorer at debian.org> Fri, 21 Nov 2014 15:39:26 +0100
+ -- Alexander Wirt <formorer at debian.org> Mon, 01 Dec 2014 20:48:59 +0100
- icinga2 (2.2.0-1~ppa1~trusty1) trusty; urgency=medium
+ icinga2 (2.2.0-2) unstable; urgency=medium
- * Rebuild for my ubuntu ppa
+ * [cf28c7d] Fix indentation in apache config
+ * [d608338] Lower needed dpkg version in pre-depends
+ * [b42c495] Let icinga2-common depend on icinga2-bin (Closes: #770534)
- -- Alexander Wirt <formorer at debian.org> Fri, 21 Nov 2014 15:35:04 +0100
+ -- Alexander Wirt <formorer at debian.org> Sat, 22 Nov 2014 13:29:20 +0100
icinga2 (2.2.0-1) unstable; urgency=medium
diff --cc debian/rules
index 9c05acf,0943ae5..1a5d740
--- a/debian/rules
+++ b/debian/rules
@@@ -36,6 -36,7 +36,10 @@@ override_dh_auto_install
override_dh_install:
dh_install
++<<<<<<< HEAD
++=======
+ chmod +x debian/icinga2-common/usr/lib/icinga2/prepare-dirs
++>>>>>>> master
# remove ido files from other packages
if [ -d debian/icinga2-common/ ]; then rm debian/icinga2-common/etc/icinga2/features-available/ido-*; fi
rm debian/icinga2-bin/usr/lib/*/icinga2/libdb_ido_*
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git
More information about the Pkg-nagios-changes
mailing list