commit eb137b16e550aee749d17596421261f3bb92db29
Merge: 74c87a0 f0fd38a
Author: Lisa Velden <[email protected]>
Date:   Tue Sep 8 16:53:04 2015 +0200

    Merge branch 'stable-2.15' into stable-2.16

    * stable-2.15
      Revision bump for 2.15.1
      Update NEWS file for 2.15.1
      Metad: ignore instances that have no communication NIC

    * stable-2.14
      Add error code to OpPrereqError use
      bdev: Allow userspace-only disk templates
      Export disk's userspace URI to OS scripts
      Fix instance failover in case of DTS_EXT_MIRROR
      Only insist on haskell test dependencies if needed

    * stable-2.13
      Fix typo in example
      Update documentation of --print-jobid

    * stable-2.12
      Add forgotten IPOLICY_SPINDLE_RATIO to __all__ variable
      Make QA turn on user-shutdown when testing it
      Fix disabling of user shutdown reporting
      Make confd answer disk requests querying by name
      gnt-node add: password auth is only one method

    * stable-2.10
      (no changes)

    * stable-2.9
      Document quoting of special values in key-value parameters
      replace-disks: fix --ignore-ipolicy

    Conflicts:
        NEWS
        configure.ac

    Resolution:
        NEWS: take both additions
        configure.ac: ignore revision bump

diff --cc NEWS
index d8137b7,d6e1820..1e6f2ec
--- a/NEWS
+++ b/NEWS
@@@ -2,41 -2,28 +2,63 @@@ New
  ====


 +Version 2.16.0 beta1
 +--------------------
 +
 +*(Released Tue, 28 Jul 2015)*
 +
 +Incompatible/important changes
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
 +- The IAllocator protocol has been extended by a new
``allocate-secondary``
 +  request type. Currently, this new request type is only used when in disk
 +  conversion to DRBD no secondary node is specified. As long as this new
 +  feature is not used, a third-party IAllocator not aware of this
extension can
 +  be continued to be used.
 +- ``htools`` now also take into account N+1 redundancy for plain and
shared
 +  storage. To obtain the old behavior, add the ``--no-capacity-checks``
option.
 +- ``hail`` now tries to keep the overall cluster balanced; in particular
it
 +  now prefers more empty groups over groups that are internally more
balanced.
 +
 +New features
 +~~~~~~~~~~~~
 +
 +- ``hbal`` can now be made aware of common causes of failures (for
 +  nodes). Look at ``hbal`` man page's LOCATION TAGS section for more
details.
 +- ``hbal`` can now be made aware of desired location for instances. Look
 +  at ``hbal`` man page's DESIRED LOCATION TAGS section for more details.
 +- Secret parameters are now readacted in job files
 +
 +New dependencies
 +~~~~~~~~~~~~~~~~
 +

-- 
Lisa Velden
Software Engineer
[email protected]

Google Germany GmbH
Dienerstraße 12
80331 München

Geschäftsführer: Graham Law, Christine Elizabeth Flores
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg

Reply via email to