Merge "Update to simplified common oslo version code."

This commit is contained in:
Jenkins
2013-02-12 05:21:55 +00:00
committed by Gerrit Code Review
5 changed files with 187 additions and 132 deletions

View File

@@ -64,12 +64,11 @@ copyright = u'2010-present, OpenStack, LLC'
# |version| and |release|, also used in various other places throughout the
# built documents.
#
from nova import version as nova_version
#import nova.version
from nova.version import version_info
# The full version, including alpha/beta/rc tags.
release = nova_version.version_string()
release = version_info.release_string()
# The short X.Y version.
version = nova_version.canonical_version_string()
version = version_info.version_string()
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.