Merge branch 'stable-2.8' into master
authorThomas Thrainer <thomasth@google.com>
Wed, 26 Jun 2013 07:57:25 +0000 (09:57 +0200)
committerThomas Thrainer <thomasth@google.com>
Wed, 26 Jun 2013 09:18:32 +0000 (11:18 +0200)
commitdad226e3895a439cb828e8ae1b0d9c4e89b6c508
tree03cf092667c9f47044eccb0a596e8166a0967ac2
parentc632d3a569af4914cfb72b251381d826dd62d127
parente4b5f9557bed05eb75b597ad1031ed24815ea951
Merge branch 'stable-2.8' into master

* stable-2.8:
  gnt-cluster info (py): add enabled disk templates
  Version bump to 2.8.0~beta1
  Change version numbers in documentation
  Fix issue with python coverage tests
  Merge branch 'stable-2.7' into stable-2.8
  Disable python test if required libraries are missing
  Better specify what packages to install
  Improve install guide
  Fix typo in the documentation index
  Fix typos in the documentation index
  Update security document wrt confd access to SSL cert
  Add tools for building deb packages to build_chroot
  Improve the final message of build_chroot
  Make build_chroot self-contained

Conflicts:
configure.ac (trivial)
lib/cmdlib/instance_storage.py (trivial)

The version numbers changed in 'Change version numbers in documentation'
and 'Version bump to 2.8.0~beta1' were adapted to 2.9.

Signed-off-by: Thomas Thrainer <thomasth@google.com>
Reviewed-by: Michele Tartara <mtartara@google.com>
17 files changed:
INSTALL
Makefile.am
NEWS
README
configure.ac
devel/build_chroot
doc/design-draft.rst
doc/hooks.rst
doc/iallocator.rst
doc/security.rst
doc/virtual-cluster.rst
lib/cmdlib/cluster.py
lib/cmdlib/instance_storage.py
lib/hypervisor/hv_kvm.py
man/gnt-instance.rst
man/gnt-node.rst
src/Ganeti/Query/Server.hs