summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-06-22 00:05:59 +0000
committerGerrit Code Review <review@openstack.org>2012-06-22 00:05:59 +0000
commitae9034c9e9a837e40f161e8337a48c0abdcf90a1 (patch)
treef05b1f645f82e533ec5625558ef135bb56b3fb18
parent63845ef258d74d584dfe4e415321485e371bcde3 (diff)
parentb602ec55e079eed7040b4e63755b7b0412d9f8d6 (diff)
Merge "Final versioning for 2012.1.1" into stable/essex2012.1.1
-rw-r--r--AUTHORS1
-rw-r--r--horizon/version.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 22400c1..d962023 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -32,6 +32,7 @@ Joshua McKenty <joshua@pistoncloud.com>
32Julien Danjou <julien.danjou@enovance.com> 32Julien Danjou <julien.danjou@enovance.com>
33Ken Pepple <ken.pepple@gmail.com> 33Ken Pepple <ken.pepple@gmail.com>
34Mark Gius <launchpad@markgius.com> 34Mark Gius <launchpad@markgius.com>
35Mark McLoughlin <markmc@redhat.com>
35Michael Szilagyi <mszilagyi@gmail.com> 36Michael Szilagyi <mszilagyi@gmail.com>
36Mike Perez <thingee@gmail.com> 37Mike Perez <thingee@gmail.com>
37Mike Scherbakov <mihgen@gmail.com> 38Mike Scherbakov <mihgen@gmail.com>
diff --git a/horizon/version.py b/horizon/version.py
index 17b7d4c..730f387 100644
--- a/horizon/version.py
+++ b/horizon/version.py
@@ -21,7 +21,7 @@ version_info = {'branch_nick': u'LOCALBRANCH',
21 21
22HORIZON_VERSION = ['2012', '1', '1'] 22HORIZON_VERSION = ['2012', '1', '1']
23YEAR, COUNT, REVISION = HORIZON_VERSION 23YEAR, COUNT, REVISION = HORIZON_VERSION
24FINAL = False # This becomes true at Release Candidate time 24FINAL = True # This becomes true at Release Candidate time
25 25
26 26
27def canonical_version_string(): 27def canonical_version_string():