Commit a91f69c4 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Bump version for Ganeti 2.4.0~beta1



Update the version in all necessary places. Update NEWS with release
date.
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent 3daa24ea
......@@ -4,7 +4,7 @@ News
Version 2.4.0 beta1
-------------------
*(unreleased)*
*(Released Fri, 14 Jan 2011)*
User-visible
~~~~~~~~~~~~
......
# Configure script for Ganeti
m4_define([gnt_version_major], [2])
m4_define([gnt_version_minor], [3])
m4_define([gnt_version_revision], [1])
m4_define([gnt_version_suffix], [])
m4_define([gnt_version_minor], [4])
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,
......
......@@ -209,6 +209,9 @@ class TestCfgupgrade(unittest.TestCase):
def testUpgradeFrom_2_3(self):
self._TestSimpleUpgrade(constants.BuildVersion(2, 3, 0), False)
def testUpgradeFrom_2_4(self):
self._TestSimpleUpgrade(constants.BuildVersion(2, 4, 0), False)
def testUpgradeCurrent(self):
self._TestSimpleUpgrade(constants.CONFIG_VERSION, False)
......@@ -224,6 +227,9 @@ class TestCfgupgrade(unittest.TestCase):
def testUpgradeDryRunFrom_2_3(self):
self._TestSimpleUpgrade(constants.BuildVersion(2, 3, 0), True)
def testUpgradeDryRunFrom_2_4(self):
self._TestSimpleUpgrade(constants.BuildVersion(2, 4, 0), True)
def testUpgradeCurrentDryRun(self):
self._TestSimpleUpgrade(constants.CONFIG_VERSION, True)
......
......@@ -171,14 +171,14 @@ def main():
raise Error("Inconsistent configuration: found config_version in"
" configuration file")
# Upgrade from 2.0/2.1/2.2 to 2.3
if config_major == 2 and config_minor in (0, 1, 2):
# 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_revision != 0:
logging.warning("Config revision is %s, not 0", config_revision)
config_data["version"] = constants.BuildVersion(2, 3, 0)
config_data["version"] = constants.BuildVersion(2, 4, 0)
elif config_major == 2 and config_minor == 3:
elif config_major == 2 and config_minor == 4:
logging.info("No changes necessary")
else:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment