[Pkg-nagios-changes] [pkg-icinga2] 01/04: Merge branch 'master' into ubuntu
Alexander Wirt
formorer at debian.org
Wed Apr 20 12:44:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch ubuntu
in repository pkg-icinga2.
commit f82cac8e63f3150d6e0e1975b294a23538be4fe1
Merge: bd6b986 bc6a6d8
Author: Alexander Wirt <formorer at debian.org>
Date: Wed Apr 20 14:38:50 2016 +0200
Merge branch 'master' into ubuntu
.gitignore | 6 +-
.mailmap | 4 +-
AUTHORS | 4 +-
CMakeLists.txt | 72 ++--
ChangeLog | 64 ++++
RELEASE.md | 6 +-
agent/CMakeLists.txt | 2 +-
agent/windows-setup-agent/Icinga2SetupAgent.csproj | 39 ++-
agent/windows-setup-agent/Program.cs | 53 ++-
.../windows-setup-agent/ServiceStatus.Designer.cs | 168 +++++-----
agent/windows-setup-agent/ServiceStatus.cs | 5 +
agent/windows-setup-agent/SetupWizard.Designer.cs | 1 -
agent/windows-setup-agent/SetupWizard.cs | 34 +-
agent/windows-setup-agent/icinga-banner.png | Bin 25166 -> 2376 bytes
cmake/InstallConfig.cmake | 26 +-
debian/changelog | 8 +-
doc/1-about.md | 64 ++++
doc/11-icinga2-client.md | 79 ++++-
doc/13-distributed-monitoring-ha.md | 18 +-
doc/18-language-reference.md | 1 +
doc/2-getting-started.md | 30 +-
doc/22-migrating-from-icinga-1x.md | 18 -
doc/3-monitoring-basics.md | 2 +
doc/5-advanced-topics.md | 89 +++++
doc/6-object-types.md | 12 +-
doc/7-icinga-template-library.md | 6 +
doc/9-icinga2-api.md | 2 +-
.../icinga2_windows_running_service.png | Bin 0 -> 94889 bytes
.../icinga2_windows_setup_installer_01.png | Bin 0 -> 19483 bytes
.../icinga2_windows_setup_installer_02.png | Bin 0 -> 28449 bytes
.../icinga2_windows_setup_installer_03.png | Bin 0 -> 17551 bytes
.../icinga2_windows_setup_installer_04.png | Bin 0 -> 16644 bytes
.../icinga2_windows_setup_installer_05.png | Bin 0 -> 11081 bytes
.../icinga2_windows_setup_wizard_01.png | Bin 0 -> 29478 bytes
.../icinga2_windows_setup_wizard_02.png | Bin 0 -> 47264 bytes
.../icinga2_windows_setup_wizard_03.png | Bin 0 -> 31344 bytes
.../icinga2_windows_setup_wizard_04.png | Bin 0 -> 34177 bytes
.../icinga2_windows_setup_wizard_05.png | Bin 0 -> 98464 bytes
.../icinga2_windows_setup_wizard_06.png | Bin 0 -> 20242 bytes
...icinga2_windows_setup_wizard_examine_config.png | Bin 0 -> 22755 bytes
etc/CMakeLists.txt | 5 +-
etc/logrotate.d/icinga2.cmake | 4 +-
icinga-app/icinga.cpp | 35 +-
icinga-installer/CMakeLists.txt | 58 ++++
icinga-installer/bannrbmp.bmp | Bin 0 -> 29914 bytes
icinga-installer/dlgbmp.bmp | Bin 0 -> 155830 bytes
icinga-installer/icinga-installer.cpp | 324 ++++++++++++++++++
icinga-installer/icinga2.wixpatch.cmake | 46 +++
icinga2.nuspec | 5 +-
icinga2.spec | 2 +-
itl/command-plugins.conf | 6 +
itl/plugins-contrib.d/databases.conf | 12 +
lib/base/CMakeLists.txt | 2 +-
lib/base/objectlock.hpp | 4 +-
lib/base/scriptframe.cpp | 23 +-
lib/base/scriptframe.hpp | 4 +
lib/base/socketevents-epoll.cpp | 209 ++++++++++++
lib/base/socketevents-poll.cpp | 199 +++++++++++
lib/base/socketevents.cpp | 366 ++++-----------------
lib/base/socketevents.hpp | 91 ++++-
lib/base/string-script.cpp | 2 +-
lib/base/tlsstream.cpp | 4 +-
lib/base/utility.cpp | 43 ++-
lib/base/utility.hpp | 5 +
lib/base/value.hpp | 8 +
lib/checker/CMakeLists.txt | 5 +-
lib/cli/nodeutility.cpp | 2 +-
lib/config/configitem.cpp | 37 ++-
lib/config/expression.cpp | 11 +-
lib/db_ido/dbconnection.cpp | 21 --
lib/db_ido/dbconnection.hpp | 4 -
lib/db_ido/dbevents.cpp | 61 +++-
lib/db_ido/dbquery.hpp | 3 +-
lib/db_ido/dbvalue.cpp | 5 +
lib/db_ido/dbvalue.hpp | 4 +-
lib/db_ido_mysql/idomysqlconnection.cpp | 23 +-
lib/db_ido_pgsql/idopgsqlconnection.cpp | 25 +-
lib/icinga/apiactions.cpp | 9 +-
lib/icinga/checkable-check.cpp | 31 +-
lib/icinga/checkable.hpp | 2 +-
lib/icinga/checkable.ti | 1 +
lib/icinga/comment.cpp | 7 +-
lib/icinga/comment.ti | 2 +-
lib/icinga/downtime.cpp | 7 +-
lib/icinga/downtime.ti | 2 +-
lib/icinga/externalcommandprocessor.cpp | 14 +-
lib/icinga/notification.cpp | 6 +-
lib/icinga/pluginutility.cpp | 7 +-
lib/icinga/user.cpp | 2 +
lib/notification/CMakeLists.txt | 5 +-
lib/notification/notificationcomponent.cpp | 3 +
lib/remote/httpserverconnection.cpp | 6 +-
lib/remote/objectqueryhandler.cpp | 8 +-
tools/chocolateyInstall.ps1 | 9 +-
tools/chocolateyUninstall.ps1 | 47 +--
tools/mkclass/classcompiler.cpp | 105 +++---
tools/syntax/vim/syntax/icinga2.vim | 2 +-
97 files changed, 1957 insertions(+), 789 deletions(-)
diff --cc debian/changelog
index 1341e4d,4f95a18..c9b7ab8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,14 @@@
- icinga2 (2.4.4-1~ppa1~wily1) wily; urgency=medium
++icinga2 (2.4.5-1~ppa1~wily1) wily; urgency=medium
+
+ * Rebuild for my ubuntu ppa
+
+ -- Alexander Wirt <formorer at debian.org> Wed, 16 Mar 2016 13:09:11 +0100
+
- icinga2 (2.4.3-1) vivid; urgency=medium
+ icinga2 (2.4.5-1) unstable; urgency=medium
+
+ * [26a7374] Imported Upstream version 2.4.5
+
+ -- Alexander Wirt <formorer at debian.org> Wed, 20 Apr 2016 13:09:03 +0200
icinga2 (2.4.4-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