[Pkg-nagios-changes] [pkg-icinga2] 01/01: Merge branch 'master' into debmon-wheezy
Alexander Wirt
formorer at debian.org
Wed Jul 8 12:09:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch debmon-wheezy
in repository pkg-icinga2.
commit 1af3bd7c8c246bed62a0ce2ff3053dda1d3068d5
Merge: 88f6eaf b19e4e8
Author: Alexander Wirt <formorer at debian.org>
Date: Wed Jul 8 11:51:12 2015 +0200
Merge branch 'master' into debmon-wheezy
Conflicts:
debian/changelog
AUTHORS | 7 +
CMakeLists.txt | 3 +
ChangeLog | 42 +++
INSTALL.md | 9 +-
README.md | 7 +-
RELEASE.md | 48 +++-
agent/windows-setup-agent/Icinga2SetupAgent.csproj | 9 +
agent/windows-setup-agent/Program.cs | 37 ++-
.../windows-setup-agent/ServiceStatus.Designer.cs | 118 +++++++++
agent/windows-setup-agent/ServiceStatus.cs | 37 +++
agent/windows-setup-agent/ServiceStatus.resx | 138 ++++++++++
agent/windows-setup-agent/SetupWizard.Designer.cs | 83 +++---
agent/windows-setup-agent/SetupWizard.cs | 54 ++--
changelog.py | 95 +++++--
debian/changelog | 9 +-
doc/1-about.md | 42 +++
doc/12-distributed-monitoring-ha.md | 36 +--
doc/13-addons-plugins.md | 19 ++
doc/16-troubleshooting.md | 5 +-
doc/19-language-reference.md | 1 -
doc/2-getting-started.md | 17 +-
doc/3-monitoring-basics.md | 4 +-
doc/7-icinga-template-library.md | 123 ++++++++-
icinga-app/icinga.cpp | 41 +--
icinga2.nuspec | 26 ++
icinga2.spec | 18 +-
itl/command-nscp-local.conf | 3 +-
itl/command-plugins-manubulon.conf | 5 +
itl/command-plugins-windows.conf | 8 +-
itl/command-plugins.conf | 118 ++++++++-
itl/plugins-contrib.d/databases.conf | 124 ++++++++-
itl/plugins-contrib.d/network-components.conf | 2 +-
itl/plugins-contrib.d/operating-system.conf | 1 -
itl/plugins-contrib.d/web.conf | 2 +-
lib/base/netstring.cpp | 4 +-
lib/base/netstring.hpp | 2 +-
lib/base/stdiostream.cpp | 5 +
lib/base/stdiostream.hpp | 1 +
lib/base/stream.cpp | 12 +-
lib/base/stream.hpp | 9 +-
lib/cli/nodeaddcommand.hpp | 6 +-
lib/cli/nodelistcommand.hpp | 6 +-
lib/cli/noderemovecommand.hpp | 6 +-
lib/cli/nodesetcommand.hpp | 6 +-
lib/cli/nodesetupcommand.cpp | 11 +-
lib/cli/nodesetupcommand.hpp | 6 +-
lib/cli/nodeupdateconfigcommand.hpp | 6 +-
lib/cli/nodeutility.cpp | 8 +-
lib/cli/nodeutility.hpp | 6 +-
lib/cli/nodewizardcommand.cpp | 5 +-
lib/cli/nodewizardcommand.hpp | 8 +-
lib/db_ido/dbevents.cpp | 2 -
lib/icinga/apievents.cpp | 291 +++++++++++++++++----
lib/icinga/icinga-type.conf | 1 +
lib/remote/apiclient.cpp | 6 +-
lib/remote/apiclient.hpp | 1 +
plugins/CMakeLists.txt | 34 +--
plugins/check_disk.cpp | 258 +++++++++---------
lib/cli/nodeaddcommand.hpp => plugins/check_disk.h | 46 ++--
plugins/check_load.cpp | 81 +++---
lib/cli/nodeaddcommand.hpp => plugins/check_load.h | 33 +--
plugins/check_memory.cpp | 86 +++---
.../nodeaddcommand.hpp => plugins/check_memory.h | 33 +--
plugins/check_network.cpp | 194 +++++++++-----
.../nodeaddcommand.hpp => plugins/check_network.h | 41 +--
plugins/check_ping.cpp | 147 +++++------
lib/cli/nodeaddcommand.hpp => plugins/check_ping.h | 40 +--
plugins/check_procs.cpp | 116 ++++----
.../nodeaddcommand.hpp => plugins/check_procs.h | 34 +--
plugins/check_service.cpp | 71 ++---
.../nodeaddcommand.hpp => plugins/check_service.h | 34 +--
plugins/check_swap.cpp | 80 +++---
lib/cli/nodeaddcommand.hpp => plugins/check_swap.h | 36 +--
plugins/check_update.cpp | 76 +++---
.../nodeaddcommand.hpp => plugins/check_update.h | 36 +--
plugins/check_uptime.cpp | 84 +++---
.../nodeaddcommand.hpp => plugins/check_uptime.h | 36 +--
plugins/check_users.cpp | 91 +++----
plugins/check_users.h | 15 ++
plugins/thresholds.cpp | 79 +++---
plugins/thresholds.h | 76 +++---
tools/chocolateyInstall.ps1 | 7 +
82 files changed, 2297 insertions(+), 1266 deletions(-)
diff --cc debian/changelog
index def166c,f48b54c..ca44774
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,15 @@@
- icinga2 (2.3.5-1~debmon70+1) debmon-wheezy; urgency=medium
++icinga2 (2.3.6-1~debmon70+1) debmon-wheezy; urgency=medium
+
+ * Rebuild for debmon-wheezy.
+
+ -- Alexander Wirt <formorer at debian.org> Thu, 18 Sep 2014 08:12:04 +0200
++=======
+ icinga2 (2.3.6-1) unstable; urgency=medium
+
+ [ Alexander Wirt ]
+ * [7eaa5f9] Imported Upstream version 2.3.6
+
+ -- Alexander Wirt <formorer at debian.org> Wed, 08 Jul 2015 10:57:35 +0200
icinga2 (2.3.5-1) unstable; urgency=medium
--
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