[icinga-checkins] icinga.org: icinga-core/master: prepare several files for release

git at icinga.org git at icinga.org
Sun Oct 25 21:22:48 CET 2009


Module: icinga-core
Branch: master
Commit: a8eec33d266deaaabcc6fa86635a9c2ed59a2e8b
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=a8eec33d266deaaabcc6fa86635a9c2ed59a2e8b

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sun Oct 25 21:22:33 2009 +0100

prepare several files for release
* cleanup configure
* modify UPGRADING and THANKS
* update Changelog
* actual pointers to submodules docbook/icinga-api

---

 Changelog         |    7 +++++--
 THANKS            |    6 +++---
 UPGRADING         |    8 +++++---
 configure         |    4 ++--
 configure.in      |    4 ++--
 docbook           |    2 +-
 module/icinga-api |    2 +-
 7 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Changelog b/Changelog
index c1e45d7..6c07eca 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,5 @@
 #######################
-Icinga 0.8.x Change Log
+Icinga 1.0.x Change Log
 #######################
 
 1.0 RC - 28/10/2009
@@ -34,9 +34,12 @@ Icinga 0.8.x Change Log
 * core init: delete 'su' usage since all previously su touched files were created by the icinga user
 * idoutils: fix unescape bug during tabstops
 * idoutils: fix idomod/icinga segfault while try to use ssl on unix sockets
+* idoutils: set long_output/perfdata to TEXT in MySQL
 * core configure: set INIT_OPTS depending on detected host OS (no more root:root on FreeBSD?)
 * core spec: added new spec file
-* idoutils: fix case insensitive
+* idoutils: fix case insensitive comparison in MySQL using BINARY
+* idoutils: change ido2db.cfg: ndo2db_[user|group] to ido2db_[user|group]
+* core web: fix missing gif icon copy
 
 0.8.4 - 09/15/2009
 * idoutils: fix failure_prediction_options in tables hosts, services for postgres
diff --git a/THANKS b/THANKS
index 6beb2ad..6d08969 100644
--- a/THANKS
+++ b/THANKS
@@ -2,10 +2,10 @@
 THANKS!
 =======
 
-The success of Nagios has been due to the fantastic community members that
+The success of Nagios/Icinga has been due to the fantastic community members that
 support it and provide bug reports, patches, and great ideas.  Here are a
-few of the many members that have contributed to Nagios in various ways
-since 1999.  If I missed your name, let me know.
+few of the many members that have contributed to Nagios since 1999 and Icinga since 2009
+in various ways.  If we missed your name, let us know.
 
 * Greg Abrams
 * Petr Adamec
diff --git a/UPGRADING b/UPGRADING
index 2b97924..072dc6a 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -1,16 +1,18 @@
-Upgrading to Nagios 3.x
+Upgrading to Icinga 1.x
 -----------------------
 
 The HTML documentation covers what you need to know in order
-to upgrade from Nagios 2.x  You can find the documentation in
+to upgrade. You can find the documentation in
 the following subdirectory:
 
 	html/docs
 
+or on
+	http://docs.icinga.org
+
 Make sure to read the following sections:
 
 - "What's New" (whatsnew.html)
-- "Upgrading Nagios" (upgrading.html)
 
 
 
diff --git a/configure b/configure
index 7d29aaf..2490294 100755
--- a/configure
+++ b/configure
@@ -6955,14 +6955,14 @@ echo "${ECHO_T}no" >&6; }
 		echo "      1. Make sure /etc/ld.so.conf has an entry for the directory in"
 		echo "         which the GD, PNG, and JPEG libraries are installed."
 		echo "      2. Run 'ldconfig' to update the run-time linker options."
-		echo "      3. Run 'make clean' in the Nagios distribution to clean out"
+		echo "      3. Run 'make clean' in the Icinga distribution to clean out"
 		echo "         any old references to your previous compile."
 		echo "      4. Rerun the configure script."
 		echo ""
 		echo "NOTE: If you can't get the configure script to recognize the GD libs"
 		echo "      on your system, get over it and move on to other things.  The"
 		echo "      CGIs that use the GD libs are just a small part of the entire"
-		echo "      Nagios package.  Get everything else working first and then"
+		echo "      Icinga package.  Get everything else working first and then"
 		echo "      revisit the problem.  Make sure to check the icinga-users"
 		echo "      mailing list archives for possible solutions to GD library"
 		echo "      problems when you resume your troubleshooting."
diff --git a/configure.in b/configure.in
index c9b8ade..a347c33 100644
--- a/configure.in
+++ b/configure.in
@@ -492,14 +492,14 @@ if test x$TRYGD = xyep; then
 		echo "      1. Make sure /etc/ld.so.conf has an entry for the directory in"
 		echo "         which the GD, PNG, and JPEG libraries are installed."
 		echo "      2. Run 'ldconfig' to update the run-time linker options."
-		echo "      3. Run 'make clean' in the Nagios distribution to clean out"
+		echo "      3. Run 'make clean' in the Icinga distribution to clean out"
 		echo "         any old references to your previous compile."
 		echo "      4. Rerun the configure script."
 		echo ""
 		echo "NOTE: If you can't get the configure script to recognize the GD libs"
 		echo "      on your system, get over it and move on to other things.  The"
 		echo "      CGIs that use the GD libs are just a small part of the entire"
-		echo "      Nagios package.  Get everything else working first and then"
+		echo "      Icinga package.  Get everything else working first and then"
 		echo "      revisit the problem.  Make sure to check the icinga-users"
 		echo "      mailing list archives for possible solutions to GD library"
 		echo "      problems when you resume your troubleshooting."
diff --git a/docbook b/docbook
index 661f628..a9a4953 160000
--- a/docbook
+++ b/docbook
@@ -1 +1 @@
-Subproject commit 661f628a749d9e69b0a3b7ff08dead568bb28bee
+Subproject commit a9a495349fe71afee491d1fc1589ad4eb961d8f9
diff --git a/module/icinga-api b/module/icinga-api
index 4cefd99..40d2f1d 160000
--- a/module/icinga-api
+++ b/module/icinga-api
@@ -1 +1 @@
-Subproject commit 4cefd99a18cea50a592c06cc57f2436556fe9381
+Subproject commit 40d2f1de56d342316ef0f0afc6ee75e3a29e4199





More information about the icinga-checkins mailing list