[Pkg-ganeti-devel] [ganeti] 66/165: Merge branch 'stable-2.14' into master

[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 d18e2939c4bb995202de940dd568dc60824d5524
Merge: 62cfd30 f10e4ca
Author: Hrvoje Ribicic <riba at google.com>
Date:   Wed Mar 4 18:50:29 2015 +0000

    Merge branch 'stable-2.14' into master
    
    * stable-2.14
      Add a missing dependency for MonD to the cabal template
      Enable export tests in QA for all templates
      Improve backup LU testing
      Add the long-sleep option to prevent long shutdowns
      Fix exception throwing when zeroing
      Use snapshot success info to export whenever possible
      Return success of snapshotting and refactor code
      Factor snapshottability into a Disk method
      Use UUID and not logical_id to mark exported disks
      Do not delete disks if we did not make snapshots
      Restore previous snapshot behaviour for LVM
      Make QA that would have failed
      Make snapshotting for exports optional
      Don't use snapshots on exports with instance turned off
      Add documentation for return values of PollJob call stack
      Remove unittest assuming file disks are not exportable
      In Makefile use the cabal executable from configure time
    
    * stable-2.13
      Document hbal's additional levels of verbosity
    
    * stable-2.12
      (no changes)
    
    * stable-2.11
      (no changes)
    
    * stable-2.10
      Relax expectation of accuracy
      Improve rounding accuracty in updateStatistics
      Update gnt-backup manual to reflect real behavior
      Finalize local export only if successful
    
    * stable-2.9
      Stop MonD when removing a node from a cluster
    
    Conflicts:
            lib/cmdlib/backup.py
            lib/masterd/instance.py
    Resolution:
            Take the 2.14 changes.
    
    Signed-off-by: Hrvoje Ribicic <riba at google.com>
    Reviewed-by: Petr Pudlak <pudlak at google.com>

 Makefile.am                             |   2 +-
 cabal/ganeti.template.cabal             |   1 +
 lib/backend.py                          |  20 ++---
 lib/cli_opts.py                         |   4 +
 lib/client/gnt_backup.py                |   5 +-
 lib/cmdlib/backup.py                    |  50 +++++++----
 lib/masterd/instance.py                 | 141 +++++++++++++++++++++-----------
 lib/objects.py                          |   4 +
 man/gnt-backup.rst                      |  21 +++--
 man/htools.rst                          |   2 +-
 qa/ganeti-qa.py                         |   3 +-
 qa/qa_instance.py                       |   9 +-
 src/Ganeti/Constants.hs                 |   5 ++
 src/Ganeti/OpCodes.hs                   |   1 +
 src/Ganeti/OpParams.hs                  |   7 ++
 src/Ganeti/Utils/Statistics.hs          |   2 +-
 test/hs/Test/Ganeti/OpCodes.hs          |  23 ++++--
 test/hs/Test/Ganeti/Utils/Statistics.hs |   2 +-
 test/py/cmdlib/backup_unittest.py       | 121 +++++++++++++++++++++++++--
 19 files changed, 316 insertions(+), 107 deletions(-)


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