[Pkg-ganeti-devel] [ganeti] 03/165: Merge branch 'stable-2.14'

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository ganeti.

commit 794f62e63bb55caf5df724e6924019e4e3b58100
Merge: 89e230a 3ce0c35
Author: Aaron Karper <akarper at google.com>
Date:   Tue Jan 20 15:03:52 2015 +0100

    Merge branch 'stable-2.14'
    
    * stable-2.14
      tests.cmdlib: Test detach/attach for file disks
      tests.filestorage: Test if rename works properly
      cmdlib: Rename file disk in attach/detach
      filestorage: Enable the Rename action
      cmdlib: Create wrapper for GenerateDiskTemplate
      config: Add SetDiskLogicalID function
      constants: Add new disk template set
      doc: Add design doc for detached file-based disks
    
    Signed-off-by: Aaron Karper <akarper at google.com>
    Reviewed-by: Petr Pudlak <pudlak at google.com>

 doc/design-file-based-disks-ownership.rst      | 67 ++++++++++++++++++++++++++
 doc/index.rst                                  |  1 +
 lib/cmdlib/instance_set_params.py              | 60 ++++++++++++++++++-----
 lib/config/__init__.py                         | 22 +++++++++
 lib/storage/filestorage.py                     | 17 ++++++-
 src/Ganeti/Constants.hs                        |  7 +++
 test/py/cmdlib/instance_unittest.py            | 41 ++++++++++++++++
 test/py/cmdlib/testsupport/cmdlib_testcase.py  |  6 +++
 test/py/ganeti.storage.filestorage_unittest.py | 10 ++++
 9 files changed, 216 insertions(+), 15 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git