commit a706da8ba93df793a6414e44b5386bebbc2897e7
Merge: 3359324 9812a6a
Author: Hrvoje Ribicic <[email protected]>
Date:   Mon Aug 10 11:58:10 2015 +0200

    Merge branch 'stable-2.15' into stable-2.16

    * stable-2.15
      Bump suffix to 2.15.0
      Update NEWS file for 2.15.0

    * stable-2.14
      (no changes)

    * stable-2.13
      (no changes)

    * stable-2.12
      Accept allocation of 0 jobs
      Return multiple fields multiple times
      In queries collect all needed data
      Add a function computing the filter arguments
      Utils: Add ordNub
      Accept timeout errors are luxi down
      Correct indendation
      In confd provide proper serial number

    * stable-2.11
      (no changes)

    * stable-2.10
      Add a new unit test for LUInstanceMultiAlloc
      Fix a bug in LUInstanceMultiAlloc LU

    Conflicts:
            NEWS: Use the 2.15 version
    configure.ac: Restore the 2.16 suffix

    Signed-off-by: Hrvoje Ribicic <[email protected]>

diff --cc NEWS
index 45b89e5,4f25ef9..d8137b7
--- a/NEWS
+++ b/NEWS
@@@ -2,45 -2,10 +2,45 @@@ 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
 +~~~~~~~~~~~~~~~~
 +
 +- Using the metadata daemon now requires the presence of the 'setcap'
utility.
 +  On Debian-based systems, it is available as a part of the 'libcap2-bin'
 +  package.
 +
 +
- Version 2.15.0 rc1
- ------------------
+ Version 2.15.0
+ --------------

- *(Released Wed, 17 Jun 2015)*
+ *(Released Wed, 29 Jul 2015)*

  Incompatible/important changes
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Hrvoje Ribicic
Ganeti Engineering
Google Germany GmbH
Dienerstr. 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