From a09a66ce91fbe7e4f5526eb68f174c4d698e5880 Mon Sep 17 00:00:00 2001
From: Dolph Mathews <dolph.mathews@gmail.com>
Date: Fri, 9 Dec 2011 14:04:31 -0600
Subject: Fixed broken import of version info (bug 902316)

Change-Id: I9efaab46c1fe93dbfc9e9c08c6b79a8c23eb8fd5
---
 doc/source/conf.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 1f7b8b03..ac43451c 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -78,11 +78,11 @@ copyright = u'2011-present, OpenStack, LLC.'
 # built documents.
 #
 # The short X.Y version.
-from keystone import version as keystone_version
+from keystone import version
 # The full version, including alpha/beta/rc tags.
-release = keystone_version()
+release = version.version()
 # The short X.Y version.
-version = keystone_version()
+version = version.canonical_version()
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-- 
cgit