Bump version for Ganeti 2.3

Also update cfgupgrade and NEWS.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>

diff --git a/NEWS b/NEWS
index a5965fd..9970be0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ News
 Version 2.3 rc0
 ---------------
 
-*(unreleased)*
+*(Released Tue, 2 Nov 2010)*
 
 - Fixed clearing of the default iallocator using ``gnt-cluster modify``
 - Fixed master failover race with watcher
@@ -22,6 +22,8 @@ Version 2.3 rc0
 - Added option to ignore offline node on instance start/stop
   (``--ignore-offline``)
 - Allow overriding OS parameters with ``gnt-instance reinstall``
+- Added ability to change node's secondary IP address using ``gnt-node
+  modify``
 - Implemented privilege separation for all daemons except
   ``ganeti-noded``, see ``configure`` options
 - Complain if an instance's disk is marked faulty in ``gnt-cluster

diff --git a/configure.ac b/configure.ac
index 0cd5170..862bf13 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 # Configure script for Ganeti
 m4_define([gnt_version_major], [2])
-m4_define([gnt_version_minor], [2])
-m4_define([gnt_version_revision], [1])
-m4_define([gnt_version_suffix], [])
+m4_define([gnt_version_minor], [3])
+m4_define([gnt_version_revision], [0])
+m4_define([gnt_version_suffix], [~rc0])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
                     gnt_version_major, gnt_version_minor,

diff --git a/tools/cfgupgrade b/tools/cfgupgrade
index 00dbb22..0b135ce 100755 (executable)
--- a/tools/cfgupgrade
+++ b/tools/cfgupgrade
@@ -141,14 +141,14 @@ def main():
     raise Error("Inconsistent configuration: found config_version in"
                 " configuration file")
 
-  # Upgrade from 2.0/2.1 to 2.2
-  if config_major == 2 and config_minor in (0, 1):
+  # Upgrade from 2.0/2.1/2.2 to 2.3
+  if config_major == 2 and config_minor in (0, 1, 2):
     if config_revision != 0:
       logging.warning("Config revision is %s, not 0", config_revision)
 
-    config_data["version"] = constants.BuildVersion(2, 2, 0)
+    config_data["version"] = constants.BuildVersion(2, 3, 0)
 
-  elif config_major == 2 and config_minor == 2:
+  elif config_major == 2 and config_minor == 3:
     logging.info("No changes necessary")
 
   else: