Bump version to 2.1.0~rc0

Also add one item to NEWS.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>

diff --git a/NEWS b/NEWS
index c791f1e..6516412 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -86,6 +86,7 @@ Details
   hypervisors using the new ``migration_port`` parameter
 - Pass ``INSTANCE_REINSTALL`` variable to OS installation script when
   reinstalling an instance
+- Allowed ``@`` in tag names
 - Migrated to Sphinx (http://sphinx.pocoo.org/) for documentation
 - Many documentation updates
 - Distribute hypervisor files on ``gnt-cluster redist-conf``

diff --git a/configure.ac b/configure.ac
index b47bc6c..a973ac1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 m4_define([gnt_version_major], [2])
 m4_define([gnt_version_minor], [1])
 m4_define([gnt_version_revision], [0])
-m4_define([gnt_version_suffix], [~beta2])
+m4_define([gnt_version_suffix], [~rc0])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
                     gnt_version_major, gnt_version_minor,