Bump version for 2.5.0~rc6 release

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --git a/NEWS b/NEWS
index 7945165..b3e60a8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,10 +2,10 @@ News
 ====
 
 
-Version 2.5.0 rc5
+Version 2.5.0 rc6
 -----------------
 
-*(Released Mon, 9 Jan 2012)*
+*(Released Fri, 23 Mar 2012)*
 
 Incompatible/important changes and bugfixes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -41,6 +41,7 @@ Incompatible/important changes and bugfixes
 - Offline nodes are ignored when failing over an instance.
 - Support for KVM version 1.0, which changed the version reporting format
   from 3 to 2 digits.
+- ``Makefile`` is now compatible with Automake 1.11.2
 - Includes all bugfixes made in the 2.4 series
 
 New features
@@ -133,6 +134,15 @@ Misc
 - A short delay when waiting for job changes reduces the number of LUXI
   requests significantly.
 - DRBD metadata volumes are overwritten with zeros during disk creation.
+- ``devel/upload`` now uses correct permissions for directories.
+
+
+Version 2.5.0 rc5
+-----------------
+
+*(Released Mon, 9 Jan 2012)*
+
+This was the fifth release candidate of the 2.5 series.
 
 
 Version 2.5.0 rc4

diff --git a/configure.ac b/configure.ac
index c5a3b84..3b49bbf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 m4_define([gnt_version_major], [2])
 m4_define([gnt_version_minor], [5])
 m4_define([gnt_version_revision], [0])
-m4_define([gnt_version_suffix], [~rc5])
+m4_define([gnt_version_suffix], [~rc6])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
                     gnt_version_major, gnt_version_minor,