From d60d189ab531fa82c9ad14a2a0cf24710b8ea3b2 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Fri, 27 Jul 2012 12:59:54 +0200
Subject: [PATCH] Release version 2.6.0 (final)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Phew, it wasn't easy, but…

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Bernardo Dal Seno <bdalseno@google.com>
---
 NEWS         | 34 +++++++++++++++++++++++++++-------
 configure.ac |  2 +-
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index 114156162..8e3ecf724 100644
--- a/NEWS
+++ b/NEWS
@@ -2,10 +2,20 @@ News
 ====
 
 
-Version 2.6.0 rc4
------------------
+Version 2.6.0
+-------------
+
+*(Released Fri, 27 Jul 2012)*
+
+
+.. attention:: The ``LUXI`` protocol has been made more consistent
+   regarding its handling of command arguments. This, however, leads to
+   incompatibility issues with previous versions. Please ensure that you
+   restart Ganeti daemons soon after the upgrade, otherwise most
+   ``LUXI`` calls (job submission, setting/resetting the drain flag,
+   pausing/resuming the watcher, cancelling and archiving jobs, querying
+   the cluster configuration) will fail.
 
-*(Released Thu, 19 Jul 2012)*
 
 New features
 ~~~~~~~~~~~~
@@ -305,10 +315,20 @@ changed to allow the same clock skew as permitted by the cluster
 verification. This will remove some rare but hard to diagnose errors in
 import-export.
 
-The ``LUXI`` protocol has been made more consistent regarding its
-handling of command arguments. This, however, leads to incompatibility
-issues with previous versions. Please ensure that you restart Ganeti
-daemons after the upgrade, otherwise job submission will fail.
+
+Version 2.6.0 rc4
+-----------------
+
+*(Released Thu, 19 Jul 2012)*
+
+Very few changes from rc4 to the final release, only bugfixes:
+
+- integrated fixes from release 2.5.2 (fix general boot flag for KVM
+  instance, fix CDROM booting for KVM instances)
+- fixed node group modification of node parameters
+- fixed issue in LUClusterVerifyGroup with multi-group clusters
+- fixed generation of bash completion to ensure a stable ordering
+- fixed a few typos
 
 
 Version 2.6.0 rc3
diff --git a/configure.ac b/configure.ac
index 0d0630aff..ebc00b36c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 m4_define([gnt_version_major], [2])
 m4_define([gnt_version_minor], [6])
 m4_define([gnt_version_revision], [0])
-m4_define([gnt_version_suffix], [~rc4])
+m4_define([gnt_version_suffix], [])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
                     gnt_version_major, gnt_version_minor,
-- 
GitLab