From 9f18e2ccb130682148a605bd9709d3df98d2d6c6 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 9 Jan 2012 17:27:10 +0100
Subject: [PATCH] Bump version to 2.5.0~rc5, update NEWS
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
NEWS | 25 ++++++++++++-------------
configure.ac | 2 +-
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/NEWS b/NEWS
index aa8bf69e6..794516533 100644
--- a/NEWS
+++ b/NEWS
@@ -5,19 +5,7 @@ News
Version 2.5.0 rc5
-----------------
-*(unreleased)*
-
-Improvements and bugfixes
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-- Support for kvm version 1.0, that changed the version reporting format
- (from 3 to 2 digits).
-
-
-Version 2.5.0 rc4
------------------
-
-*(Released Thu, 27 Oct 2011)*
+*(Released Mon, 9 Jan 2012)*
Incompatible/important changes and bugfixes
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -51,6 +39,9 @@ Incompatible/important changes and bugfixes
- :doc:`New iallocator modes <design-multi-reloc>` have been added to
support operations involving multiple node groups.
- 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.
+- Includes all bugfixes made in the 2.4 series
New features
~~~~~~~~~~~~
@@ -144,6 +135,14 @@ Misc
- DRBD metadata volumes are overwritten with zeros during disk creation.
+Version 2.5.0 rc4
+-----------------
+
+*(Released Thu, 27 Oct 2011)*
+
+This was the fourth release candidate of the 2.5 series.
+
+
Version 2.5.0 rc3
-----------------
diff --git a/configure.ac b/configure.ac
index dbad2efbd..c5a3b8413 100644
--- 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], [~rc4])
+m4_define([gnt_version_suffix], [~rc5])
m4_define([gnt_version_full],
m4_format([%d.%d.%d%s],
gnt_version_major, gnt_version_minor,
--
GitLab