commit d92cc30cf08350f31a150a19047d0060c6ae7a0b
Merge: 35f0456 aa93573
Author: Klaus Aehlig <[email protected]>
Date: Wed Mar 25 17:55:20 2015 +0100
Merge branch 'stable-2.13' into stable-2.14
* stable-2.13
Bump version suffix up to ~rc1
Update NEWS file
Add missing news about disk conversion
* stable-2.12
Revision bump to 2.12.2
Update NEWS for 2.12.2
Conflicts:
NEWS
Resolution:
take all the additions
Semantical conflic:
ignore suffix bump
Signed-off-by: Klaus Aehlig <[email protected]>
diff --cc NEWS
index 2664958,b2ea45c..2be655a
--- a/NEWS
+++ b/NEWS
@@@ -2,45 -2,10 +2,45 @@@ New
====
+Version 2.14.0 beta1
+--------------------
+
+*(Released Fri, 13 Feb 2015)*
+
+New features
+~~~~~~~~~~~~
+
+- The build system now enforces external Haskell dependencies to lie in
+ a supported range as declared by our new ganeti.cabal file.
+- Basic support for instance reservations has been added. Instance addition
+ supports a --forthcoming option telling Ganeti to only reserve the resources
+ but not create the actual instance. The instance can later be created with
+ by passing the --commit option to the instance addition command.
+- Node tags starting with htools:nlocation: now have a special meaning to
htools(1).
+ They control between which nodes migration is possible, e.g., during
hypervisor
+ upgrades. See hbal(1) for details.
+- The node-allocation lock as been removed for good, thus speeding up parallel
+ instance allocation and creation.
+
+New dependencies
+~~~~~~~~~~~~~~~~
+
+- Building the Haskell part of Ganeti now requires Cabal and cabal-install.
+
+Known issues
+~~~~~~~~~~~~
+
+This beta is known to have all issues of 2.13.0 beta1, in particular the
following.
+
+- Issue 1018: Cluster init (and possibly other jobs) occasionally fail to
start.
+
+We will move to rc1 only once these issues are fixed.
+
+
- Version 2.13.0 beta1
- --------------------
+ Version 2.13.0 rc1
+ ------------------
- *(Released Wed, 14 Jan 2015)*
+ *(Released Wed, 25 Mar 2015)*
Incompatible/important changes
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
