summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2011-12-06 12:03:48 +0000
committerMark McLoughlin <markmc@redhat.com>2011-12-06 12:08:43 +0000
commit0bbb0e8cb1daa351af91cf97b2bcababfc0c7f9f (patch)
treef9ffaa26d7bfeb2d1f21de8f09b3e0a3c407dd47 /nova
parent48755d74c6c40e5027460d0fbf32f9c8e292e06f (diff)
downloadnova-0bbb0e8cb1daa351af91cf97b2bcababfc0c7f9f.tar.gz
nova-0bbb0e8cb1daa351af91cf97b2bcababfc0c7f9f.tar.xz
nova-0bbb0e8cb1daa351af91cf97b2bcababfc0c7f9f.zip
Remove some remnants of ChangeLog and vcsversion.py generation
Since moving to bzr, we no longer generate ChangeLog and vcsversion.py and since commit deb31cb55 we no longer even have the bzr specific code for generating them. So, let's just remove any references to them. Change-Id: I4f96b9be48e289f9129ae8e3ad4cbc1b22db07d2
Diffstat (limited to 'nova')
-rw-r--r--nova/version.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/nova/version.py b/nova/version.py
index 06810df46..9a6563b80 100644
--- a/nova/version.py
+++ b/nova/version.py
@@ -14,14 +14,6 @@
# License for the specific language governing permissions and limitations
# under the License.
-try:
- from nova.vcsversion import version_info
-except ImportError:
- version_info = {'branch_nick': u'LOCALBRANCH',
- 'revision_id': 'LOCALREVISION',
- 'revno': 0}
-
-
NOVA_VERSION = ['2012', '1']
YEAR, COUNT = NOVA_VERSION
FINAL = False # This becomes true at Release Candidate time
@@ -39,7 +31,7 @@ def version_string():
def vcs_version_string():
- return '%s:%s' % (version_info['branch_nick'], version_info['revision_id'])
+ return 'LOCALBRANCH:LOCALREVISION'
def version_string_with_vcs():