summaryrefslogtreecommitdiff
path: root/doc/source/conf.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-21 21:50:21 +0000
committerGerrit Code Review <review@openstack.org>2013-01-21 21:50:21 +0000
commitbf09dd9573f396d703a0df60a5d5e0bc1d280d1f (patch)
tree55373b1cf7363b53264dc8c652be1d779541de3c /doc/source/conf.py
parentc19426609696ba1817e50b3caed5f524cdcd0688 (diff)
parent8b80285da695e35133719669fc632aa83a512b6d (diff)
downloadpython-swiftclient-1.3.0.tar.gz
Merge "Update to latest oslo version/setup."1.3.0
Diffstat (limited to 'doc/source/conf.py')
-rw-r--r--doc/source/conf.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index a82c1ed..b1baab4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -57,10 +57,8 @@ copyright = u'2012 OpenStack, LLC.'
# built documents.
#
from swiftclient.version import version_info as swiftclient_version
-# The full version, including alpha/beta/rc tags.
release = swiftclient_version.version_string()
-# The short X.Y version.
-version = swiftclient_version.canonical_version_string()
+version = swiftclient_version.version_string()
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.