diff --git a/README b/README index 212e788e17407ac700476c4e41bb6270eefcb815..744c6bceab961925d07d2f72f2e607fb3445b98f 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 cbc700a09771edef70be5bf2d9b7ea4a3981d13c..4f80c0f82ede8a2199e0fd94ed5aa4e93785b7f9 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 2dbed13d37894af851eafc21cb291f978e099ac3..d9f09f2b4de03812d53bf788f0983a784b60c822 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 b8c752cfb5f3f4d7d1effcfffa1b924e74568984..a81e981a1ea01e1f1eafe1372e33bf5db1eeadc2 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 359a298dcc0fef07316aa50ca6d956d744448f4a..ba54b881f01a5321685312c8b9e44b9d10db06da 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 487969a1c832d9b1da083af4f6c3719f38fbef3a..20486cb8fe24eb59bf51c81b839f44ff750f548b 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: