diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-12 05:21:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-12 05:21:55 +0000 |
| commit | dc4b108c8e821a7243ffdbc8974534c2bb42729e (patch) | |
| tree | 777ea19416db0cc6b72d5861edeb029109b01835 /doc | |
| parent | f73cb58b09c648d37af030286b1666b631998d03 (diff) | |
| parent | 43361527684f3029a6c91a25ca475b7aa05807ca (diff) | |
| download | nova-dc4b108c8e821a7243ffdbc8974534c2bb42729e.tar.gz nova-dc4b108c8e821a7243ffdbc8974534c2bb42729e.tar.xz nova-dc4b108c8e821a7243ffdbc8974534c2bb42729e.zip | |
Merge "Update to simplified common oslo version code."
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/conf.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py index 0bdaeb08e..9af5f5494 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -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. |