[Pkg-ganeti-devel] [ganeti] 120/165: Merge branch 'stable-2.14' into stable-2.15

[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 0a8288fe37c6af8e9f60f24544dd351dcd034002
Merge: 665d6c0 004b239
Author: Helga Velroyen <helgav at google.com>
Date:   Wed Apr 29 10:00:25 2015 +0200

    Merge branch 'stable-2.14' into stable-2.15
    
    * stable-2.14
      Suffix bump for 2.14.0~rc1
      Update NEWS for 2.14.0~rc1
      clean up now dead code
      writeConfigAndUnlock: only unlock after config write
      ConfigLock design: change writeAndUnlock
      Distribute doc/design-file-based-disks-ownership.rst
    
    * stable-2.13
      Rename SSH Update evaluation function more expressively
      Using named tuple for node info in ssh file manager
      Helper functions to assert key existence for sets of nodes
      Add RetryByNumberOfTimes utility function
      Suffix bump for 2.13.0
      Update NEWS file for 2.13.0 release
    
    * stable-2.12
      Revision bump to 2.12.3
      Update NEWS for 2.12.3
    
    Conflicts:
      NEWS
      configure.ac
    
    Solutions:
      NEWS: keep 2.15 entries, change 2.14 from beta2 to rc1
      configure: keep version 2.15.0~alpha1
    
    Signed-off-by: Helga Velroyen <helgav at google.com>
    Reviewed-by: Klaus Aehlig <aehlig at google.com>

 NEWS                               | 105 +++++++++++++++++++++--
 configure.ac                       |   1 +
 doc/design-configlock.rst          |  58 ++++++++++---
 lib/backend.py                     | 171 ++++++++++++++++---------------------
 lib/cmdlib/common.py               |   2 +-
 lib/cmdlib/node.py                 |  13 +--
 lib/utils/retry.py                 |  28 ++++++
 src/Ganeti/WConfd/ConfigWriter.hs  |   8 --
 src/Ganeti/WConfd/Core.hs          |   3 +-
 test/py/ganeti.backend_unittest.py | 147 ++++++++++++++-----------------
 test/py/testutils_ssh.py           | 143 +++++++++++++++++++------------
 11 files changed, 409 insertions(+), 270 deletions(-)

diff --cc NEWS
index 380797b,1241b09..e9cbf16
--- a/NEWS
+++ b/NEWS
@@@ -2,41 -2,10 +2,41 @@@ New
  ====
  
  
 +Version 2.15.0 beta1
 +--------------------
 +
 +*(unreleased)*
 +
 +Incompatible/important changes
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
 +- In order to improve allocation efficiency when using DRBD, the cluster
 +  metric now takes the total reserved memory into account. A consequence
 +  of this change is that the best possible cluster metric is no longer 0.
 +  htools(1) interprets minimal cluster scores to be offsets of the theoretical
 +  lower bound, so only users interpreting the cluster score directly should
 +  be affected.
 +
 +New features
 +~~~~~~~~~~~~
 +
 +- On dedicated clusters, hail will now favour allocations filling up
 +  nodes efficiently over balanced allocations.
 +
 +New dependencies
 +~~~~~~~~~~~~~~~~
 +
 +- The indirect dependency on Haskell package 'case-insensitive' is now
 +  explicit.
 +
 +Known issues
 +~~~~~~~~~~~~
 +
 +
- Version 2.14.0 beta2
- --------------------
+ Version 2.14.0 rc1
+ ------------------
  
- *(Released Thu, 26 Mar 2015)*
+ *(Released Wed, 29 Apr 2015)*
  
  New features
  ~~~~~~~~~~~~
diff --cc configure.ac
index 4b07b32,e4c32ea..9504922
--- a/configure.ac
+++ b/configure.ac
@@@ -1,8 -1,8 +1,9 @@@
  # Configure script for Ganeti
  m4_define([gnt_version_major], [2])
 -m4_define([gnt_version_minor], [14])
 +m4_define([gnt_version_minor], [15])
  m4_define([gnt_version_revision], [0])
 +m4_define([gnt_version_suffix], [~alpha1])
+ m4_define([gnt_version_suffix], [~rc1])
  m4_define([gnt_version_full],
            m4_format([%d.%d.%d%s],
                      gnt_version_major, gnt_version_minor,

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