summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Pepple <ken.pepple@gmail.com>2011-01-09 09:25:27 -0800
committerKen Pepple <ken.pepple@gmail.com>2011-01-09 09:25:27 -0800
commit5424690912a6edc2a64bfbbd44120e52a85c7f48 (patch)
treec424ece6b9c5e9bd0384cc8e3bcb5b49398575e4
parent346bd0e7c93757f940f133179b36657302d4296f (diff)
downloadnova-5424690912a6edc2a64bfbbd44120e52a85c7f48.tar.gz
nova-5424690912a6edc2a64bfbbd44120e52a85c7f48.tar.xz
nova-5424690912a6edc2a64bfbbd44120e52a85c7f48.zip
added myself to authors and fixed typo to follow standard
-rw-r--r--Authors2
-rw-r--r--doc/source/conf.py7
2 files changed, 5 insertions, 4 deletions
diff --git a/Authors b/Authors
index 8dfaf9557..99c493b0e 100644
--- a/Authors
+++ b/Authors
@@ -40,4 +40,4 @@ Trey Morris <trey.morris@rackspace.com>
Vishvananda Ishaya <vishvananda@gmail.com>
Youcef Laribi <Youcef.Laribi@eu.citrix.com>
Zhixue Wu <Zhixue.Wu@citrix.com>
-
+Ken Pepple <ken.pepple@gmail.com>
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 34c4ec288..996dfb0a7 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -60,11 +60,12 @@ copyright = u'2010, United States Government as represented by the Administrator
# |version| and |release|, also used in various other places throughout the
# built documents.
#
-import nova.version
+from nova import version as nova_version
+#import nova.version
# The full version, including alpha/beta/rc tags.
-release = nova.version.version_string()
+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.