Revision a91f69c4
| b/NEWS | ||
|---|---|---|
| 4 | 4 |
Version 2.4.0 beta1 |
| 5 | 5 |
------------------- |
| 6 | 6 |
|
| 7 |
*(unreleased)*
|
|
| 7 |
*(Released Fri, 14 Jan 2011)*
|
|
| 8 | 8 |
|
| 9 | 9 |
User-visible |
| 10 | 10 |
~~~~~~~~~~~~ |
| b/configure.ac | ||
|---|---|---|
| 1 | 1 |
# Configure script for Ganeti |
| 2 | 2 |
m4_define([gnt_version_major], [2]) |
| 3 |
m4_define([gnt_version_minor], [3])
|
|
| 4 |
m4_define([gnt_version_revision], [1])
|
|
| 5 |
m4_define([gnt_version_suffix], []) |
|
| 3 |
m4_define([gnt_version_minor], [4])
|
|
| 4 |
m4_define([gnt_version_revision], [0])
|
|
| 5 |
m4_define([gnt_version_suffix], [~beta1])
|
|
| 6 | 6 |
m4_define([gnt_version_full], |
| 7 | 7 |
m4_format([%d.%d.%d%s], |
| 8 | 8 |
gnt_version_major, gnt_version_minor, |
| b/test/cfgupgrade_unittest.py | ||
|---|---|---|
| 209 | 209 |
def testUpgradeFrom_2_3(self): |
| 210 | 210 |
self._TestSimpleUpgrade(constants.BuildVersion(2, 3, 0), False) |
| 211 | 211 |
|
| 212 |
def testUpgradeFrom_2_4(self): |
|
| 213 |
self._TestSimpleUpgrade(constants.BuildVersion(2, 4, 0), False) |
|
| 214 |
|
|
| 212 | 215 |
def testUpgradeCurrent(self): |
| 213 | 216 |
self._TestSimpleUpgrade(constants.CONFIG_VERSION, False) |
| 214 | 217 |
|
| ... | ... | |
| 224 | 227 |
def testUpgradeDryRunFrom_2_3(self): |
| 225 | 228 |
self._TestSimpleUpgrade(constants.BuildVersion(2, 3, 0), True) |
| 226 | 229 |
|
| 230 |
def testUpgradeDryRunFrom_2_4(self): |
|
| 231 |
self._TestSimpleUpgrade(constants.BuildVersion(2, 4, 0), True) |
|
| 232 |
|
|
| 227 | 233 |
def testUpgradeCurrentDryRun(self): |
| 228 | 234 |
self._TestSimpleUpgrade(constants.CONFIG_VERSION, True) |
| 229 | 235 |
|
| b/tools/cfgupgrade | ||
|---|---|---|
| 171 | 171 |
raise Error("Inconsistent configuration: found config_version in"
|
| 172 | 172 |
" configuration file") |
| 173 | 173 |
|
| 174 |
# Upgrade from 2.0/2.1/2.2 to 2.3
|
|
| 175 |
if config_major == 2 and config_minor in (0, 1, 2): |
|
| 174 |
# Upgrade from 2.0/2.1/2.2/2.3 to 2.4
|
|
| 175 |
if config_major == 2 and config_minor in (0, 1, 2, 3):
|
|
| 176 | 176 |
if config_revision != 0: |
| 177 | 177 |
logging.warning("Config revision is %s, not 0", config_revision)
|
| 178 | 178 |
|
| 179 |
config_data["version"] = constants.BuildVersion(2, 3, 0)
|
|
| 179 |
config_data["version"] = constants.BuildVersion(2, 4, 0)
|
|
| 180 | 180 |
|
| 181 |
elif config_major == 2 and config_minor == 3:
|
|
| 181 |
elif config_major == 2 and config_minor == 4:
|
|
| 182 | 182 |
logging.info("No changes necessary")
|
| 183 | 183 |
|
| 184 | 184 |
else: |
Also available in: Unified diff