Commit 9f604ab8 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Bump version to 2.5.0~beta1


Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent 9bb69bb5
Ganeti 2.4
Ganeti 2.5
==========
For installation instructions, read the INSTALL and the doc/install.html
......
# 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,
......
Ganeti customisation using hooks
================================
Documents ganeti version 2.0
Documents Ganeti version 2.5
.. contents::
......
Ganeti automatic instance allocation
====================================
Documents Ganeti version 2.4
Documents Ganeti version 2.5
.. contents::
......
......@@ -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)
......
......@@ -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:
......
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