Revision b830193c

b/README
1
Ganeti 2.6
1
Ganeti 2.7
2 2
==========
3 3

  
4 4
For installation instructions, read the INSTALL and the doc/install.rst
b/configure.ac
1 1
# Configure script for Ganeti
2 2
m4_define([gnt_version_major], [2])
3
m4_define([gnt_version_minor], [6])
4
m4_define([gnt_version_revision], [2])
5
m4_define([gnt_version_suffix], [])
3
m4_define([gnt_version_minor], [7])
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/doc/design-draft.rst
2 2
Design document drafts
3 3
======================
4 4

  
5
.. Last updated for Ganeti 2.6
5
.. Last updated for Ganeti 2.7
6 6

  
7 7
.. toctree::
8 8
   :maxdepth: 2
b/doc/hooks.rst
1 1
Ganeti customisation using hooks
2 2
================================
3 3

  
4
Documents Ganeti version 2.6
4
Documents Ganeti version 2.7
5 5

  
6 6
.. contents::
7 7

  
b/doc/iallocator.rst
1 1
Ganeti automatic instance allocation
2 2
====================================
3 3

  
4
Documents Ganeti version 2.6
4
Documents Ganeti version 2.7
5 5

  
6 6
.. contents::
7 7

  
b/doc/security.rst
1 1
Security in Ganeti
2 2
==================
3 3

  
4
Documents Ganeti version 2.6
4
Documents Ganeti version 2.7
5 5

  
6 6
Ganeti was developed to run on internal, trusted systems. As such, the
7 7
security model is all-or-nothing.
b/doc/virtual-cluster.rst
1 1
Virtual cluster support
2 2
=======================
3 3

  
4
Documents Ganeti version 2.6
4
Documents Ganeti version 2.7
5 5

  
6 6
.. contents::
7 7

  
b/tools/cfgupgrade
52 52
#: Target major version we will upgrade to
53 53
TARGET_MAJOR = 2
54 54
#: Target minor version we will upgrade to
55
TARGET_MINOR = 6
55
TARGET_MINOR = 7
56 56

  
57 57

  
58 58
class Error(Exception):
......
204 204
    raise Error("Inconsistent configuration: found config_version in"
205 205
                " configuration file")
206 206

  
207
  # Upgrade from 2.0/2.1/2.2/2.3 to 2.4
208
  if config_major == 2 and config_minor in (0, 1, 2, 3, 4, 5):
207
  # Upgrade from 2.{0..6} to 2.7
208
  if config_major == 2 and config_minor in (0, 1, 2, 3, 4, 5, 6):
209 209
    if config_revision != 0:
210 210
      logging.warning("Config revision is %s, not 0", config_revision)
211 211

  

Also available in: Unified diff