[Pkg-ganeti-devel] [ganeti] 125/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 c2607a60dbcc14f3063c2fd73bad9951dd49b670
Merge: da7e9a9 f163763
Author: Petr Pudlak <pudlak at google.com>
Date:   Tue Jun 2 12:01:24 2015 +0200

    Merge branch 'stable-2.14' into stable-2.15
    
    * stable-2.14
      Suffix bump for 2.14.0
      Prepare NEWS for 2.14.0 release
      Get QuickCheck 2.7 compatibility
      For instances use the real instance disk template
      Log iAllocator request at debug level
      Do not assume all requests are relocation requests
      In opportunistic locking, update NODE_RES locks after nodes
      Suffix bump for 2.14.0~rc2
      Prepare NEWS for 2.14.0~rc2
    
    * stable-2.13
      Increase waiting time to avoid races
      Avoid watcher interaction in TestFilterRateLimit
      Avoid races in TestAdHocReasonRateLimit
      Avoid races in TestFilterRateLimit
    
    * stable-2.12
      Make WConfD's updateLocksWaiting safe
      Tests specifying safeUpdateLocksWaiting
      Provide a repeatable version of updateLocksWaiting
      Verify that updateLocks is idempotent
      Always accept no-op requests
      Allow unconditional failovers off offline nodes
      Remove now unused variable
      Fix bug in ssconf comparison, disable it for vcluster
      QA: test renewing the cluster certificate only
      QA: Assert equality of ssconf_master_candidate_certs
      QA: Add more verify steps in renew crypto QA
      Add a unit test for the Gluster storage type
      Add missing Gluster storage verification checks
      Add Gluster type to the node storage reporting set
      Introduce the Gluster storage type
      Make xend-config.sxp optional
      Revision bump to 2.12.4
      Update NEWS for 2.12.4
      Ignore *.dyn* files generated by GHC 7.8
      Replace HFLAGS_NOPROF with HFLAGS_DYNAMIC in the Makefile
    
    * stable-2.11
      (no news)
    
    * stable-2.10
      Substitute 'suffix' for 'revision'
      Check for gnt-cluster before running gnt-cluster upgrade
    
    Conflicts:
    	NEWS - keep both 2.14 and 2.15 parts
    	configure.ac - keep 2.15 version
    	src/Ganeti/HTools/Cluster.hs - remove applyMoveEx, which was
                moved to Ganeti.HTools.Cluster.Moves
    
    Signed-off-by: Petr Pudlak <pudlak at google.com>
    Reviewed-by: Helga Velroyen <helgav at google.com>

 .gitignore                             |  2 +
 NEWS                                   | 68 +++++++++++++++++++++++++++++-----
 doc/design-upgrade.rst                 |  2 +-
 doc/examples/ganeti.cron.in            |  2 +-
 lib/cmdlib/cluster/verify.py           |  2 +-
 lib/cmdlib/instance_create.py          |  6 +++
 lib/hypervisor/hv_xen.py               |  1 +
 lib/masterd/iallocator.py              | 14 +++----
 qa/qa_cluster.py                       | 44 ++++++++++++++++++++++
 qa/qa_filters.py                       | 25 ++++++++-----
 src/Ganeti/HTools/Node.hs              | 13 ++++++-
 src/Ganeti/Locking/Waiting.hs          | 42 ++++++++++++++++++++-
 src/Ganeti/WConfd/Core.hs              |  2 +-
 test/hs/Test/Ganeti/Locking/Waiting.hs | 61 ++++++++++++++++++++++++++++++
 14 files changed, 251 insertions(+), 33 deletions(-)

diff --cc NEWS
index 92cf1ab,38dcb36..b0476ba
--- a/NEWS
+++ b/NEWS
@@@ -2,41 -2,10 +2,41 @@@ New
  ====
  
  
 +Version 2.15.0 beta1
 +--------------------
 +
 +*(Released Thu, 30 Apr 2015)*
 +
 +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 rc1
- ------------------
+ Version 2.14.0
+ --------------
  
- *(Released Wed, 29 Apr 2015)*
+ *(Released Tue, 2 Jun 2015)*
  
  New features
  ~~~~~~~~~~~~

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