Open Icehouse development

This should be accepted/merged once all the RC1 bugfixes are in.

This bumps the target version to 2014.1, effectively opening the master
branch to Icehouse development, ending the feature freeze.

The Havana release branch is cut from the previous commit in master.

Change-Id: Id33ea4faa8497f636999583781f652e3e4ac9c21

diff --git a/setup.cfg b/setup.cfg
index c2afc765c0b84fc7799fa251ad89730d29a785f4..7a6fcaf7b4887e52240484d2a85d7d32584454cb 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = cinder
-version = 2013.2
+version = 2014.1
 summary = OpenStack Block Storage
 description-file =
     README.rst