From 9f604ab8127becefe3161887286c72b984278f56 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Fri, 29 Jul 2011 10:18:17 +0200
Subject: [PATCH] Bump version to 2.5.0~beta1
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
README | 2 +-
configure.ac | 6 +++---
doc/hooks.rst | 2 +-
doc/iallocator.rst | 2 +-
test/cfgupgrade_unittest.py | 6 ++++++
tools/cfgupgrade | 6 +++---
6 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/README b/README
index 212e788e1..744c6bcea 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Ganeti 2.4
+Ganeti 2.5
==========
For installation instructions, read the INSTALL and the doc/install.html
diff --git a/configure.ac b/configure.ac
index cbc700a09..4f80c0f82 100644
--- 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], [4])
-m4_define([gnt_version_revision], [3])
-m4_define([gnt_version_suffix], [])
+m4_define([gnt_version_minor], [5])
+m4_define([gnt_version_revision], [0])
+m4_define([gnt_version_suffix], [~beta1])
m4_define([gnt_version_full],
m4_format([%d.%d.%d%s],
gnt_version_major, gnt_version_minor,
diff --git a/doc/hooks.rst b/doc/hooks.rst
index 2dbed13d3..d9f09f2b4 100644
--- a/doc/hooks.rst
+++ b/doc/hooks.rst
@@ -1,7 +1,7 @@
Ganeti customisation using hooks
================================
-Documents ganeti version 2.0
+Documents Ganeti version 2.5
.. contents::
diff --git a/doc/iallocator.rst b/doc/iallocator.rst
index b8c752cfb..a81e981a1 100644
--- a/doc/iallocator.rst
+++ b/doc/iallocator.rst
@@ -1,7 +1,7 @@
Ganeti automatic instance allocation
====================================
-Documents Ganeti version 2.4
+Documents Ganeti version 2.5
.. contents::
diff --git a/test/cfgupgrade_unittest.py b/test/cfgupgrade_unittest.py
index 359a298dc..ba54b881f 100755
--- a/test/cfgupgrade_unittest.py
+++ b/test/cfgupgrade_unittest.py
@@ -282,6 +282,9 @@ class TestCfgupgrade(unittest.TestCase):
def testUpgradeFrom_2_4(self):
self._TestSimpleUpgrade(constants.BuildVersion(2, 4, 0), False)
+ def testUpgradeFrom_2_5(self):
+ self._TestSimpleUpgrade(constants.BuildVersion(2, 5, 0), False)
+
def testUpgradeCurrent(self):
self._TestSimpleUpgrade(constants.CONFIG_VERSION, False)
@@ -300,6 +303,9 @@ class TestCfgupgrade(unittest.TestCase):
def testUpgradeDryRunFrom_2_4(self):
self._TestSimpleUpgrade(constants.BuildVersion(2, 4, 0), True)
+ def testUpgradeDryRunFrom_2_5(self):
+ self._TestSimpleUpgrade(constants.BuildVersion(2, 5, 0), True)
+
def testUpgradeCurrentDryRun(self):
self._TestSimpleUpgrade(constants.CONFIG_VERSION, True)
diff --git a/tools/cfgupgrade b/tools/cfgupgrade
index 487969a1c..20486cb8f 100755
--- a/tools/cfgupgrade
+++ b/tools/cfgupgrade
@@ -173,13 +173,13 @@ def main():
" configuration file")
# Upgrade from 2.0/2.1/2.2/2.3 to 2.4
- if config_major == 2 and config_minor in (0, 1, 2, 3):
+ if config_major == 2 and config_minor in (0, 1, 2, 3, 4):
if config_revision != 0:
logging.warning("Config revision is %s, not 0", config_revision)
- config_data["version"] = constants.BuildVersion(2, 4, 0)
+ config_data["version"] = constants.BuildVersion(2, 5, 0)
- elif config_major == 2 and config_minor == 4:
+ elif config_major == 2 and config_minor == 5:
logging.info("No changes necessary")
else:
--
GitLab