Interdiff:
diff --git a/tools/cfgupgrade b/tools/cfgupgrade
index 8d97f5c..e1cbb43 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
@@ -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)
On Mon, Feb 4, 2013 at 3:42 PM, Guido Trotter <[email protected]> wrote:
> Signed-off-by: Guido Trotter <[email protected]>
> ---
> 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 +-
> 7 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/README b/README
> index 67d5d48..20282ee 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 2c93bfc..0683f5f 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 36b052a..581a2d4 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 956ad30..2fa3e8d 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 633d558..957c2bb 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 70d1d95..14e93c4 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 e2c0798..54abd04 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::
>
> --
> 1.7.10.4
>
--
Guido Trotter
Ganeti engineering
Google Germany
