summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Pepple <ken.pepple@gmail.com>2011-01-08 17:40:06 -0800
committerKen Pepple <ken.pepple@gmail.com>2011-01-08 17:40:06 -0800
commit16eeac71055ffa9fe0fc7a13032da4e6397121b1 (patch)
treea88efdf06ba678fdb9d6965dd322669632ad7198
parentb4ca59a68ff4a6af2967b8342b9240f0092f27a4 (diff)
fixed doc make process for new nova version (rev530) machanism
-rw-r--r--doc/source/conf.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 368a686c3..d09984b19 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -60,11 +60,11 @@ copyright = u'2010, United States Government as represented by the Administrator
# |version| and |release|, also used in various other places throughout the
# built documents.
#
-from nova import version as nova_version
+import nova.version
# The full version, including alpha/beta/rc tags.
-release = nova_version.version()
+release = nova.version.version_string()
# The short X.Y version.
-version = nova_version.canonical_version_string()
+version = nova,version.canonical_version_string()
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.