[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

[naparuba]

The following commit has been merged in the debian/master branch:
commit 79f74c76c0008be0d6231f950d4da788e8003e57
Author: naparuba <naparuba at gmail.com>
Date:   Tue Feb 28 08:56:37 2012 +0100

    TAG: 1.0

diff --git a/Changelog b/Changelog
index 6ba6653..d7ecdbb 100644
--- a/Changelog
+++ b/Changelog
@@ -3,7 +3,7 @@ Shinken ChangeLog
 #######################
 
 	
-1.0 - X/02/2012
+1.0 - 28/02/2012
 ------------------
 	CORE ENHANCEMENTS
 	* Add : shinken.sh script and skonf.py with a LOT of features for setup and configuration management.
diff --git a/bin/shinken-discovery b/bin/shinken-discovery
index d4de595..e753b4a 100755
--- a/bin/shinken-discovery
+++ b/bin/shinken-discovery
@@ -41,7 +41,7 @@ except ImportError:
 from shinken.discovery.discoverymanager import DiscoveryManager
 
 
-VERSION = '1.0rc1'
+VERSION = '1.0'
 if os.name != 'nt': 
     DEFAULT_CFG = '/etc/shinken/discovery.cfg'
 else:
diff --git a/shinken/bin.py b/shinken/bin.py
index c3860bf..dcc8744 100644
--- a/shinken/bin.py
+++ b/shinken/bin.py
@@ -30,7 +30,7 @@ Shinken.
 
 import sys
 
-VERSION = "1.0rc1"
+VERSION = "1.0"
 
 # Make sure people are using Python 2.4 or higher
 if sys.version_info < (2,4):

-- 
UNNAMED PROJECT