[Pkg-nagios-changes] [icinga] 02/02: Merge branch 'master' into debmon-wheezy

Alexander Wirt formorer at debian.org
Wed May 21 11:44:01 UTC 2014


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

formorer pushed a commit to branch debmon-wheezy
in repository icinga.

commit 6540313e96444075559a70b61308c541c39f90f1
Merge: 2314f05 f176b00
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed May 14 15:11:23 2014 +0200

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

 Changelog                                          |  45 ++
 Makefile.in                                        |  15 +-
 TESTING                                            |   2 +-
 base/broker.c                                      |   2 +-
 base/checks.c                                      |   2 +-
 base/commands.c                                    |   2 +-
 base/config.c                                      |   2 +-
 base/events.c                                      |   2 +-
 base/flapping.c                                    |   2 +-
 base/icinga.c                                      |   4 +-
 base/icingastats.c                                 |   2 +-
 base/logging.c                                     |   2 +-
 base/nebmods.c                                     |   2 +-
 base/notifications.c                               |   2 +-
 base/perfdata.c                                    |   2 +-
 base/sehandlers.c                                  |   2 +-
 base/sretention.c                                  |   2 +-
 base/utils.c                                       |   2 +-
 cgi/avail.c                                        |   2 +-
 cgi/cgiauth.c                                      |   2 +-
 cgi/cgiutils.c                                     |  26 +-
 cgi/cmd.c                                          |   9 +-
 cgi/config.c                                       |   2 +-
 cgi/extcmd_list.c                                  |   2 +-
 cgi/extinfo.c                                      |  20 +-
 cgi/getcgi.c                                       |   2 +-
 cgi/histogram.c                                    |   2 +-
 cgi/history.c                                      |   2 +-
 cgi/notifications.c                                |   2 +-
 cgi/outages.c                                      |   2 +-
 cgi/readlogs.c                                     |   2 +-
 cgi/showlog.c                                      |   2 +-
 cgi/status.c                                       |   2 +-
 cgi/statusmap.c                                    |   2 +-
 cgi/summary.c                                      |   2 +-
 cgi/tac.c                                          |   2 +-
 cgi/trends.c                                       |   2 +-
 common/comments.c                                  |   2 +-
 common/downtime.c                                  |   2 +-
 common/macros.c                                    |   2 +-
 common/objects.c                                   |   2 +-
 common/skiplist.c                                  |   2 +-
 common/statusdata.c                                |   2 +-
 configure                                          |  19 +-
 configure.in                                       |  15 +-
 debian/changelog                                   |  12 +-
 html/docs/de/about.html                            |  14 +-
 html/docs/de/activechecks.html                     |   6 +-
 html/docs/de/adaptive.html                         |   6 +-
 html/docs/de/addons.html                           |  52 +-
 html/docs/de/beginners.html                        | 290 +++++----
 html/docs/de/cachedchecks.html                     |   6 +-
 html/docs/de/cgiauth.html                          |  18 +-
 html/docs/de/cgicmd.html                           |   4 +-
 html/docs/de/cgiincludes.html                      |   4 +-
 html/docs/de/cgiparams.html                        | 240 ++++----
 html/docs/de/cgis.html                             |  32 +-
 html/docs/de/cgisecurity.html                      |  12 +-
 html/docs/de/ch01.html                             |   2 +-
 html/docs/de/ch02.html                             |   4 +-
 html/docs/de/ch03.html                             |   4 +-
 html/docs/de/ch04.html                             |   2 +-
 html/docs/de/ch05.html                             |   6 +-
 html/docs/de/ch06.html                             |   6 +-
 html/docs/de/ch07.html                             |   8 +-
 html/docs/de/ch08.html                             |   4 +-
 html/docs/de/ch09.html                             |   4 +-
 html/docs/de/ch10.html                             |   2 +-
 html/docs/de/ch11.html                             |   8 +-
 html/docs/de/ch12.html                             |  16 +-
 html/docs/de/ch13.html                             |   2 +-
 html/docs/de/checkscheduling.html                  | 160 ++---
 html/docs/de/clusters.html                         |   4 +-
 html/docs/de/components.html                       |  14 +-
 html/docs/de/config.html                           |  10 +-
 html/docs/de/configcgi.html                        | 146 ++---
 html/docs/de/configido.html                        | 217 ++++---
 html/docs/de/configmain.html                       | 296 +++++----
 html/docs/de/configobject.html                     |  12 +-
 html/docs/de/customobjectvars.html                 |   6 +-
 html/docs/de/db_changes.html                       |   4 +-
 html/docs/de/db_intro.html                         |  10 +-
 html/docs/de/db_model.html                         | 188 +++---
 html/docs/de/dependencies.html                     |   6 +-
 html/docs/de/dependencychecks.html                 |   8 +-
 html/docs/de/distributed.html                      |  26 +-
 html/docs/de/downtime.html                         |   6 +-
 html/docs/de/embeddedperl.html                     |   8 +-
 html/docs/de/epnplugins.html                       |   4 +-
 html/docs/de/escalation_condition.html             |   4 +-
 html/docs/de/escalations.html                      |   4 +-
 html/docs/de/eventhandlers.html                    |  10 +-
 html/docs/de/example-configs.html                  |   8 +-
 html/docs/de/extcommands.html                      |  16 +-
 html/docs/de/extcommands2.html                     | 326 +++++-----
 html/docs/de/faststartup.html                      |  18 +-
 html/docs/de/flapping.html                         |   4 +-
 html/docs/de/freshness.html                        |   8 +-
 html/docs/de/hostchecks.html                       |   4 +-
 html/docs/de/howtos.html                           |  36 +-
 html/docs/de/icinga-api.html                       |  18 +-
 html/docs/de/icinga-web-api.html                   |   4 +-
 html/docs/de/icinga-web-config.html                |  18 +-
 html/docs/de/icinga-web-intro.html                 |   2 +-
 html/docs/de/icinga-web-introduction.html          |  82 +--
 html/docs/de/icinga-web-pnp.html                   |  18 +-
 html/docs/de/icinga-web-scratch.html               |  42 +-
 html/docs/de/icinga_packages.html                  |   4 +-
 html/docs/de/icingastats.html                      |   4 +-
 html/docs/de/index.html                            | 228 +++----
 html/docs/de/int-mklivestatus.html                 |   6 +-
 html/docs/de/int-snmptrap.html                     |   4 +-
 html/docs/de/int-tcpwrappers.html                  |   4 +-
 html/docs/de/integration.html                      |   8 +-
 html/docs/de/ix01.html                             | 107 ++--
 html/docs/de/largeinstalltweaks.html               |  15 +-
 html/docs/de/macrolist.html                        | 634 +++++++++----------
 html/docs/de/macros.html                           |   8 +-
 html/docs/de/modified_attr.html                    |   6 +-
 html/docs/de/monitoring-linux.html                 |   6 +-
 html/docs/de/monitoring-netware.html               |   6 +-
 html/docs/de/monitoring-overview.html              |   4 +-
 html/docs/de/monitoring-printers.html              |   6 +-
 html/docs/de/monitoring-publicservices.html        |   6 +-
 html/docs/de/monitoring-routers.html               |   6 +-
 html/docs/de/monitoring-windows.html               |   8 +-
 html/docs/de/mrtggraphs.html                       |   2 +-
 html/docs/de/networkreachability.html              |   6 +-
 html/docs/de/notifications.html                    |  10 +-
 html/docs/de/notifications2.html                   |   4 +-
 html/docs/de/nrpe.html                             |  10 +-
 html/docs/de/nsca.html                             |  10 +-
 html/docs/de/objectdefinitions.html                |  76 ++-
 html/docs/de/objectinheritance.html                |  14 +-
 html/docs/de/objecttricks.html                     |  26 +-
 html/docs/de/oncallrotation.html                   |   4 +-
 html/docs/de/passivechecks.html                    |   4 +-
 html/docs/de/passivestatetranslation.html          |   4 +-
 html/docs/de/perfdata.html                         |   6 +-
 html/docs/de/perfgraphs.html                       |  24 +-
 html/docs/de/pluginapi.html                        |   4 +-
 html/docs/de/plugins.html                          |  22 +-
 html/docs/de/quickstart-icinga-freebsd.html        |   4 +-
 html/docs/de/quickstart-icinga.html                |   6 +-
 html/docs/de/quickstart-idoutils-freebsd.html      |  26 +-
 html/docs/de/quickstart-idoutils.html              |   6 +-
 html/docs/de/quickstart.html                       |   8 +-
 html/docs/de/recurring_downtimes.html              |   6 +-
 html/docs/de/redundancy.html                       |  10 +-
 html/docs/de/reporting.html                        |  54 +-
 html/docs/de/sample-cgi.html                       |   2 +-
 html/docs/de/sample-commands.html                  |   2 +-
 html/docs/de/sample-config.html                    |   2 +-
 html/docs/de/sample-contacts.html                  |   2 +-
 html/docs/de/sample-httpd.html                     |   2 +-
 html/docs/de/sample-icinga.html                    |   4 +-
 html/docs/de/sample-localhost.html                 |   2 +-
 html/docs/de/sample-notifications.html             |   2 +-
 html/docs/de/sample-printer.html                   |   2 +-
 html/docs/de/sample-resource.html                  |   2 +-
 html/docs/de/sample-switch.html                    |   2 +-
 html/docs/de/sample-templates.html                 |   2 +-
 html/docs/de/sample-timeperiods.html               |   2 +-
 html/docs/de/sample-windows.html                   |   2 +-
 html/docs/de/security.html                         |   4 +-
 html/docs/de/servicechecks.html                    |   4 +-
 html/docs/de/stalking.html                         |   4 +-
 html/docs/de/startstop.html                        |   8 +-
 html/docs/de/statetypes.html                       |   4 +-
 html/docs/de/temp_data.html                        |  10 +-
 html/docs/de/timeperiods.html                      |   4 +-
 html/docs/de/tuning.html                           |   4 +-
 html/docs/de/upgrading.html                        |  20 +-
 html/docs/de/upgrading_icingaweb.html              |  10 +-
 html/docs/de/upgrading_idoutils.html               |   4 +-
 html/docs/de/verifyconfig.html                     |  12 +-
 html/docs/de/volatileservices.html                 |   4 +-
 html/docs/de/whatsnew.html                         |   4 +-
 html/docs/en/about.html                            |  14 +-
 html/docs/en/activechecks.html                     |  10 +-
 html/docs/en/adaptive.html                         | 120 ++--
 html/docs/en/addons.html                           |  56 +-
 html/docs/en/beginners.html                        | 313 +++++-----
 html/docs/en/cachedchecks.html                     | 253 ++++----
 html/docs/en/cgiauth.html                          |  22 +-
 html/docs/en/cgicmd.html                           |   8 +-
 html/docs/en/cgiincludes.html                      |   8 +-
 html/docs/en/cgiparams.html                        | 244 ++++----
 html/docs/en/cgis.html                             |  32 +-
 html/docs/en/cgisecurity.html                      |  16 +-
 html/docs/en/ch01.html                             |   2 +-
 html/docs/en/ch02.html                             |  44 +-
 html/docs/en/ch03.html                             |   6 +-
 html/docs/en/ch04.html                             |   2 +-
 html/docs/en/ch05.html                             |  26 +-
 html/docs/en/ch06.html                             |  10 +-
 html/docs/en/ch07.html                             |  14 +-
 html/docs/en/ch08.html                             |   6 +-
 html/docs/en/ch09.html                             |   4 +-
 html/docs/en/ch10.html                             |   4 +-
 html/docs/en/ch11.html                             |   4 +-
 html/docs/en/ch12.html                             |  14 +-
 html/docs/en/ch13.html                             |   2 +-
 html/docs/en/checkscheduling.html                  |  47 +-
 html/docs/en/clusters.html                         |   8 +-
 html/docs/en/config.html                           |  14 +-
 html/docs/en/configcgi.html                        | 150 ++---
 html/docs/en/configido.html                        | 213 ++++---
 html/docs/en/configmain.html                       | 308 +++++-----
 html/docs/en/configobject.html                     |  12 +-
 html/docs/en/customobjectvars.html                 |   6 +-
 html/docs/en/db_changes.html                       |   4 +-
 html/docs/en/db_components.html                    |  14 +-
 html/docs/en/db_example-configs.html               |   8 +-
 html/docs/en/db_intro.html                         |  10 +-
 html/docs/en/db_model.html                         | 184 +++---
 html/docs/en/dependencies.html                     |  10 +-
 html/docs/en/dependencychecks.html                 |   4 +-
 html/docs/en/distributed.html                      |  30 +-
 html/docs/en/downtime.html                         |   4 +-
 html/docs/en/embeddedperl.html                     |   4 +-
 html/docs/en/epnplugins.html                       |   4 +-
 html/docs/en/escalation_condition.html             |   4 +-
 html/docs/en/escalations.html                      |   4 +-
 html/docs/en/eventhandlers.html                    |   6 +-
 html/docs/en/extcommands.html                      |  10 +-
 html/docs/en/extcommands2.html                     | 332 +++++-----
 html/docs/en/faststartup.html                      |  16 +-
 html/docs/en/flapping.html                         |   4 +-
 html/docs/en/freshness.html                        |   8 +-
 html/docs/en/hostchecks.html                       |   4 +-
 html/docs/en/howtos.html                           |  32 +-
 html/docs/en/icinga-api.html                       |  10 +-
 html/docs/en/icinga-web-api.html                   |   4 +-
 html/docs/en/icinga-web-config.html                |  18 +-
 html/docs/en/icinga-web-intro.html                 |   2 +-
 html/docs/en/icinga-web-introduction.html          |  80 +--
 html/docs/en/icinga-web-pnp.html                   |  14 +-
 html/docs/en/icinga-web-scratch.html               |  61 +-
 html/docs/en/icinga_packages.html                  |   4 +-
 html/docs/en/icingastats.html                      |   4 +-
 html/docs/en/index.html                            | 298 ++++-----
 html/docs/en/int-mklivestatus.html                 |   6 +-
 html/docs/en/int-snmptrap.html                     |   4 +-
 html/docs/en/int-tcpwrappers.html                  |   4 +-
 html/docs/en/integration.html                      |   8 +-
 html/docs/en/ix01.html                             |  95 ++-
 html/docs/en/largeinstalltweaks.html               |  18 +-
 html/docs/en/macrolist.html                        | 636 +++++++++----------
 html/docs/en/macros.html                           |   8 +-
 html/docs/en/modified_attr.html                    |   6 +-
 html/docs/en/monitoring-linux.html                 |   8 +-
 html/docs/en/monitoring-netware.html               |   4 +-
 html/docs/en/monitoring-overview.html              |   4 +-
 html/docs/en/monitoring-printers.html              | 241 ++++----
 html/docs/en/monitoring-publicservices.html        |   8 +-
 html/docs/en/monitoring-routers.html               |  10 +-
 html/docs/en/monitoring-windows.html               |  10 +-
 html/docs/en/mrtggraphs.html                       |   2 +-
 html/docs/en/networkreachability.html              |   6 +-
 html/docs/en/notifications.html                    |  10 +-
 html/docs/en/notifications2.html                   |   4 +-
 html/docs/en/nrpe.html                             |  10 +-
 html/docs/en/nsca.html                             |  10 +-
 html/docs/en/objectdefinitions.html                |  76 ++-
 html/docs/en/objectinheritance.html                |  16 +-
 html/docs/en/objecttricks.html                     |  28 +-
 html/docs/en/oncallrotation.html                   |   4 +-
 html/docs/en/passivechecks.html                    |   4 +-
 html/docs/en/passivestatetranslation.html          |   4 +-
 html/docs/en/perfdata.html                         |   6 +-
 html/docs/en/perfgraphs.html                       |  24 +-
 html/docs/en/pluginapi.html                        |   4 +-
 html/docs/en/plugins.html                          |  70 +--
 html/docs/en/quickstart-icinga-freebsd.html        |   4 +-
 html/docs/en/quickstart-icinga.html                |   4 +-
 html/docs/en/quickstart-idoutils-freebsd.html      |  19 +-
 html/docs/en/quickstart-idoutils.html              |  66 +-
 html/docs/en/quickstart.html                       |   6 +-
 html/docs/en/recurring_downtimes.html              |   4 +-
 html/docs/en/redundancy.html                       |   8 +-
 html/docs/en/reporting.html                        |  56 +-
 html/docs/en/sample-cgi.html                       |   2 +-
 html/docs/en/sample-commands.html                  |   2 +-
 html/docs/en/sample-config.html                    |   2 +-
 html/docs/en/sample-contacts.html                  |   2 +-
 html/docs/en/sample-httpd.html                     |   2 +-
 html/docs/en/sample-icinga.html                    |   4 +-
 html/docs/en/sample-localhost.html                 |   2 +-
 html/docs/en/sample-notifications.html             |   2 +-
 html/docs/en/sample-printer.html                   |   2 +-
 html/docs/en/sample-resource.html                  |   2 +-
 html/docs/en/sample-switch.html                    |   2 +-
 html/docs/en/sample-templates.html                 |   2 +-
 html/docs/en/sample-timeperiods.html               |   2 +-
 html/docs/en/sample-windows.html                   |   2 +-
 html/docs/en/security.html                         |   4 +-
 html/docs/en/servicechecks.html                    |   4 +-
 html/docs/en/stalking.html                         |   4 +-
 html/docs/en/startstop.html                        |   8 +-
 html/docs/en/statetypes.html                       |   4 +-
 html/docs/en/temp_data.html                        |  10 +-
 html/docs/en/timeperiods.html                      |   4 +-
 html/docs/en/tuning.html                           |   4 +-
 html/docs/en/upgrading.html                        |  22 +-
 html/docs/en/upgrading_icingaweb.html              |  10 +-
 html/docs/en/upgrading_idoutils.html               |   4 +-
 html/docs/en/verifyconfig.html                     |  12 +-
 html/docs/en/volatileservices.html                 |   4 +-
 html/docs/en/whatsnew.html                         |   4 +-
 html/js/common_functions.js                        |   2 +-
 html/js/page_refresh.js                            |   2 +-
 html/js/status_filter_functions.js                 |   2 +-
 html/main.html                                     |   8 +-
 icinga.spec                                        |   8 +-
 include/broker.h                                   |   2 +-
 include/cgiauth.h                                  |   2 +-
 include/cgiutils.h                                 |   2 +-
 include/comments.h                                 |   2 +-
 include/common.h                                   |   6 +-
 include/config.h.in                                |   2 +-
 include/downtime.h                                 |   2 +-
 include/epn_icinga.h                               |   2 +-
 include/getcgi.h                                   |   2 +-
 include/icinga.h                                   |   2 +-
 include/locations.h.in                             |   2 +-
 include/macros.h                                   |   2 +-
 include/nebcallbacks.h                             |   2 +-
 include/neberrors.h                                |   2 +-
 include/nebmods.h                                  |   2 +-
 include/nebmodules.h                               |   2 +-
 include/nebstructs.h                               |   2 +-
 include/objects.h                                  |   2 +-
 include/perfdata.h                                 |   2 +-
 include/readlogs.h                                 |   2 +-
 include/skiplist.h                                 |   2 +-
 include/sretention.h                               |   2 +-
 include/statusdata.h                               |   5 +-
 module/helloworld.c                                |   2 +-
 module/idoutils/db/mysql/mysql.sql                 |  13 +-
 .../db/mysql/upgrade/mysql-upgrade-1.11.3.sql      |  26 +
 .../db/mysql/upgrade/mysql-upgrade-1.12.0.sql      |  17 +
 .../db/oracle/create_icinga_objects_oracle.sql     |   2 +-
 module/idoutils/db/oracle/create_oracle_sys.sql    |   2 +-
 module/idoutils/db/oracle/oracle.sql               |   4 +-
 .../db/oracle/upgrade/oracle-upgrade-1.11.3.sql    |  56 ++
 module/idoutils/db/pgsql/pgsql.sql                 |  13 +-
 .../db/pgsql/upgrade/pgsql-upgrade-1.0.1.sql       |   2 +-
 .../db/pgsql/upgrade/pgsql-upgrade-1.11.3.sql      |  25 +
 .../db/pgsql/upgrade/pgsql-upgrade-1.12.0.sql      |  18 +
 module/idoutils/db/scripts/create_mysqldb.sh       |   2 +-
 module/idoutils/db/scripts/create_oracledb.sh      |   2 +-
 module/idoutils/db/scripts/create_pgsqldb.sh       |   2 +-
 module/idoutils/db/scripts/installdb.in            |   2 +-
 module/idoutils/include/common.h                   |  10 +-
 module/idoutils/include/db.h                       |   2 +-
 module/idoutils/include/dbhandlers.h               |   2 +-
 module/idoutils/include/dbqueries.h                |   2 +-
 module/idoutils/include/ido2db.h                   |   2 +-
 module/idoutils/include/idomod.h                   |   2 +-
 module/idoutils/include/io.h                       |   2 +-
 module/idoutils/include/protoapi.h                 |   2 +-
 module/idoutils/include/utils.h                    |   2 +-
 module/idoutils/src/db.c                           |   2 +-
 module/idoutils/src/dbhandlers.c                   |   2 +-
 module/idoutils/src/dbqueries.c                    |   2 +-
 module/idoutils/src/file2sock.c                    |   2 +-
 module/idoutils/src/ido2db.c                       |   2 +-
 module/idoutils/src/idomod.c                       |   2 +-
 module/idoutils/src/io.c                           |   2 +-
 module/idoutils/src/log2ido.c                      |   2 +-
 module/idoutils/src/sockdebug.c                    |   2 +-
 module/idoutils/src/utils.c                        |   2 +-
 sample-config/icinga.cfg.in                        |   2 +-
 t-tap/Makefile.in                                  | 143 -----
 t-tap/smallconfig/icinga.cfg                       | 106 ----
 t-tap/smallconfig/minimal.cfg                      | 202 ------
 t-tap/smallconfig/resource.cfg                     |   0
 t-tap/smallconfig/retention.dat                    | 249 --------
 t-tap/stub_broker.c                                |   9 -
 t-tap/stub_checks.c                                |   3 -
 t-tap/stub_comments.c                              |   9 -
 t-tap/stub_downtime.c                              |   4 -
 t-tap/stub_events.c                                |   5 -
 t-tap/stub_flapping.c                              |   7 -
 t-tap/stub_logging.c                               |   3 -
 t-tap/stub_notifications.c                         |   4 -
 t-tap/stub_objects.c                               |  10 -
 t-tap/stub_perfdata.c                              |   1 -
 t-tap/stub_sehandlers.c                            |   2 -
 t-tap/stub_shared.c                                |   3 -
 t-tap/stub_sretention.c                            |   3 -
 t-tap/stub_statusdata.c                            |   6 -
 t-tap/stub_utils.c                                 |   6 -
 t-tap/stub_xddefault.c                             |   5 -
 t-tap/test-stubs.c                                 | 250 --------
 t-tap/test_checks.c                                | 483 ---------------
 t-tap/test_commands.c                              | 224 -------
 t-tap/test_downtime.c                              | 260 --------
 t-tap/test_each.t                                  |   7 -
 t-tap/test_events.c                                | 332 ----------
 t-tap/test_icinga_config.c                         | 389 ------------
 t-tap/test_leak.pl                                 |  61 --
 t-tap/test_logging.c                               |  93 ---
 t-tap/test_strtoul.c                               |  68 ---
 t-tap/test_timeperiods.c                           | 588 ------------------
 t-tap/test_xsddefault.c                            | 123 ----
 t-tap/var/icinga.log.dummy                         |   1 -
 t-tap/var/icinga.log.expected                      |   2 -
 t/622extinfo-local.t                               |   8 +-
 t/670cgi-json-check.t                              | 168 -----
 t/Icinga/Test.pm                                   |  21 +-
 t/Makefile.in                                      |   9 +-
 t/etc/cgi-json-check.cfg                           |  28 -
 t/etc/icinga-json-cgi-check.cfg                    | 105 ----
 t/json_checker/JSON_checker.c                      | 104 ----
 t/json_checker/JSON_checker_lib.c                  | 400 ------------
 t/json_checker/JSON_checker_lib.h                  |  13 -
 tests/etc/1066.cfg                                 |   2 +-
 tests/etc/1228.cfg                                 |   2 +-
 tests/etc/1300.cfg                                 |   2 +-
 tests/etc/1367.cfg                                 |   2 +-
 tests/etc/1502.cfg                                 |   2 +-
 tests/etc/1773.cfg                                 |   2 +-
 tests/etc/1782.cfg                                 |   2 +-
 tests/etc/1820.cfg                                 |   2 +-
 tests/etc/1910.cfg                                 |   2 +-
 tests/etc/1974.cfg                                 |   2 +-
 tests/etc/2291.cfg                                 |   2 +-
 tests/etc/2470.cfg                                 |   2 +-
 tests/etc/2520.cfg                                 |   2 +-
 tests/etc/2534.cfg                                 |   2 +-
 tests/etc/2546.cfg                                 |   2 +-
 tests/etc/2616.cfg                                 |   2 +-
 tests/etc/2619.cfg                                 |   2 +-
 tests/etc/2647.cfg                                 |   2 +-
 tests/etc/2688.cfg                                 |   2 +-
 tests/etc/2701.cfg                                 |   2 +-
 tests/etc/2743.cfg                                 |   2 +-
 tests/etc/2878.cfg                                 |   2 +-
 tests/etc/2913.cfg                                 |   2 +-
 tests/etc/2925.cfg                                 |   2 +-
 tests/etc/3064.cfg                                 |   2 +-
 tests/etc/3088.cfg                                 |   2 +-
 tests/etc/3183.cfg                                 |   2 +-
 tests/etc/3295.cfg                                 |   2 +-
 tests/etc/3322.cfg                                 |   2 +-
 tests/etc/3324.cfg                                 |   2 +-
 tests/etc/3397.cfg                                 |   2 +-
 tests/etc/3441.cfg                                 |   2 +-
 tests/etc/3509.cfg.disabled                        |   2 +-
 tests/etc/3715.cfg                                 |   2 +-
 tests/etc/3961.cfg                                 |   2 +-
 tests/etc/4390.cfg                                 |   2 +-
 tests/etc/4534.cfg                                 |   2 +-
 tests/etc/4702.cfg.disabled                        |   2 +-
 tests/etc/4967.cfg.disabled                        |   2 +-
 tests/etc/674.cfg                                  |   2 +-
 tests/etc/949.cfg                                  |   2 +-
 tests/etc/check_startup_delay.cfg                  |   2 +-
 tests/etc/contacts.cfg                             |   2 +-
 tests/scripts/test_extcommand_1737.sh              |   2 +-
 tools/libtap/COPYING                               | 674 ---------------------
 tools/libtap/INSTALL                               |  42 --
 tools/libtap/Makefile                              |  56 --
 tools/libtap/Makefile.distclean.patch              |  14 -
 tools/libtap/Makefile.win                          |  37 --
 tools/libtap/README.icinga                         |  18 -
 tools/libtap/README.md                             | 248 --------
 tools/libtap/libtap.vcxproj                        |  80 ---
 tools/libtap/t/cmpok.c                             |  17 -
 tools/libtap/t/diesok.c                            |  15 -
 tools/libtap/t/is.c                                |  25 -
 tools/libtap/t/like.c                              |  11 -
 tools/libtap/t/notediag.c                          |  15 -
 tools/libtap/t/simple.c                            |  32 -
 tools/libtap/t/skip.c                              |  24 -
 tools/libtap/t/synopsis.c                          |  16 -
 tools/libtap/t/tap.t                               | 211 -------
 tools/libtap/t/todo.c                              |  18 -
 tools/libtap/tap.c                                 | 325 ----------
 tools/libtap/tap.h                                 | 114 ----
 tools/tinderbox_build                              | 291 ---------
 update-version                                     |   4 +-
 update-version-schema                              |   4 +-
 xdata/xodtemplate.c                                | 108 +++-
 xdata/xodtemplate.h                                |   2 +-
 xdata/xpddefault.c                                 |   2 +-
 xdata/xpddefault.h                                 |   2 +-
 xdata/xrddefault.c                                 |   2 +-
 xdata/xrddefault.h                                 |   2 +-
 xdata/xsddefault.c                                 |   8 +-
 xdata/xsddefault.h                                 |   2 +-
 493 files changed, 4921 insertions(+), 11520 deletions(-)

diff --cc debian/changelog
index 1672803,5b3464a..ccdd09b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
- icinga (1.11.1-1~debmon70+1) debmon-wheezy; urgency=medium
++icinga (1.11.3-1~debmon70+1) debmon-wheezy; urgency=medium
 +
 +  * Rebuild for debmon
 +
 + -- Alexander Wirt <formorer at debian.org>  Tue, 18 Feb 2014 16:58:58 +0100
-  
++
+ icinga (1.11.3-1) unstable; urgency=medium
+ 
+   * [ffe47a4] Imported Upstream version 1.11.3
+     - Remove libtap and JSON_checker_lib.c due to 
+       license conflicts (Icinga bugs #6022 and 6023)
+ 
+  -- Alexander Wirt <formorer at debian.org>  Mon, 12 May 2014 22:12:13 +0200
+ 
  icinga (1.11.1-1) unstable; urgency=high
  
    * [a8a977f] Imported Upstream version 1.11.1

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



More information about the Pkg-nagios-changes mailing list