Merge branch 'stable-2.7' into stable-2.8
authorThomas Thrainer <thomasth@google.com>
Wed, 7 Aug 2013 09:43:44 +0000 (11:43 +0200)
committerThomas Thrainer <thomasth@google.com>
Wed, 7 Aug 2013 11:29:29 +0000 (13:29 +0200)
commit0c0722252226210e5f9a630915d8d6801dfc509d
treedc07153c1a354c47c920b34df39bfef5b460d53f
parent33b52bdccbfbea01b616004416e6fcd4878f83d7
parente3aa2b6942dc3cc3513359a1434639265060c72b
Merge branch 'stable-2.7' into stable-2.8

* stable-2.7
  Fix documentation of gnt-instance batch-create
  Support multi instance allocs without iallocator
  Document --no-conflicts-check for gnt-network
  Check disk template in right dict when copying
  ganeti.backend_unittest: chmod restricted cmd dir
  Fix formatting of tuple in error message
  Fix 'prcre' typo in INSTALL
  Format gnt-network info group output
  Add 2.7.2 NEWS entry

Conflicts:
INSTALL
      (trivial)
NEWS
      (added entry to unreleased 2.8 section with remark that it was
       merged from 2.7)
lib/cmdlib.py
      (followed cmdlib split)

Signed-off-by: Thomas Thrainer <thomasth@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
INSTALL
NEWS
lib/client/gnt_network.py
lib/cmdlib/instance.py
man/gnt-instance.rst
test/py/ganeti.backend_unittest.py