From b830193c283fcb73ba7d2a929ac1d0e4e210977b Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Mon, 4 Feb 2013 15:28:41 +0100
Subject: [PATCH] Version bump for 2.7.0~beta1
Also update the documentation target versions and the cfgupgrade tool to
recognize 2.6 and upgrade to 2.7
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
README | 2 +-
configure.ac | 6 +++---
doc/design-draft.rst | 2 +-
doc/hooks.rst | 2 +-
doc/iallocator.rst | 2 +-
doc/security.rst | 2 +-
doc/virtual-cluster.rst | 2 +-
tools/cfgupgrade | 6 +++---
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/README b/README
index 67d5d48f9..20282ee1d 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Ganeti 2.6
+Ganeti 2.7
==========
For installation instructions, read the INSTALL and the doc/install.rst
diff --git a/configure.ac b/configure.ac
index 2c93bfc63..0683f5fcb 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], [6])
-m4_define([gnt_version_revision], [2])
-m4_define([gnt_version_suffix], [])
+m4_define([gnt_version_minor], [7])
+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/design-draft.rst b/doc/design-draft.rst
index 36b052abf..581a2d43b 100644
--- a/doc/design-draft.rst
+++ b/doc/design-draft.rst
@@ -2,7 +2,7 @@
Design document drafts
======================
-.. Last updated for Ganeti 2.6
+.. Last updated for Ganeti 2.7
.. toctree::
:maxdepth: 2
diff --git a/doc/hooks.rst b/doc/hooks.rst
index 9c957edf5..faf10b82d 100644
--- a/doc/hooks.rst
+++ b/doc/hooks.rst
@@ -1,7 +1,7 @@
Ganeti customisation using hooks
================================
-Documents Ganeti version 2.6
+Documents Ganeti version 2.7
.. contents::
diff --git a/doc/iallocator.rst b/doc/iallocator.rst
index 633d5586d..957c2bb78 100644
--- a/doc/iallocator.rst
+++ b/doc/iallocator.rst
@@ -1,7 +1,7 @@
Ganeti automatic instance allocation
====================================
-Documents Ganeti version 2.6
+Documents Ganeti version 2.7
.. contents::
diff --git a/doc/security.rst b/doc/security.rst
index 70d1d9556..14e93c4a3 100644
--- a/doc/security.rst
+++ b/doc/security.rst
@@ -1,7 +1,7 @@
Security in Ganeti
==================
-Documents Ganeti version 2.6
+Documents Ganeti version 2.7
Ganeti was developed to run on internal, trusted systems. As such, the
security model is all-or-nothing.
diff --git a/doc/virtual-cluster.rst b/doc/virtual-cluster.rst
index e2c0798d6..54abd04df 100644
--- a/doc/virtual-cluster.rst
+++ b/doc/virtual-cluster.rst
@@ -1,7 +1,7 @@
Virtual cluster support
=======================
-Documents Ganeti version 2.6
+Documents Ganeti version 2.7
.. contents::
diff --git a/tools/cfgupgrade b/tools/cfgupgrade
index 8d97f5c43..bccb34e4a 100755
--- a/tools/cfgupgrade
+++ b/tools/cfgupgrade
@@ -52,7 +52,7 @@ args = None
#: Target major version we will upgrade to
TARGET_MAJOR = 2
#: Target minor version we will upgrade to
-TARGET_MINOR = 6
+TARGET_MINOR = 7
class Error(Exception):
@@ -204,8 +204,8 @@ def main():
raise Error("Inconsistent configuration: found config_version in"
" 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, 4, 5):
+ # Upgrade from 2.{0..6} to 2.7
+ if config_major == 2 and config_minor in (0, 1, 2, 3, 4, 5, 6):
if config_revision != 0:
logging.warning("Config revision is %s, not 0", config_revision)
--
GitLab