diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-23 16:01:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-23 16:01:01 +0000 |
| commit | 75f08111273fc70e3466a57c9c878faf2ef70f00 (patch) | |
| tree | 5efe6a7057a9bbff3d41c5f0b06021aba937355b /bin | |
| parent | b05ebb87805de478b8d264b5636cc0d22d0a7946 (diff) | |
| parent | 444af9db83b4fab394440249da993d2cdd208229 (diff) | |
| download | keystone-75f08111273fc70e3466a57c9c878faf2ef70f00.tar.gz keystone-75f08111273fc70e3466a57c9c878faf2ef70f00.tar.xz keystone-75f08111273fc70e3466a57c9c878faf2ef70f00.zip | |
Merge "Migrate to pbr."
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/keystone-all | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/keystone-all b/bin/keystone-all index 0ed21790..93ce34e4 100755 --- a/bin/keystone-all +++ b/bin/keystone-all @@ -19,12 +19,12 @@ if os.path.exists(os.path.join(possible_topdir, from paste import deploy +import pbr.version from keystone import config from keystone.common import wsgi_server from keystone.common import utils from keystone.openstack.common import importutils -from keystone.openstack.common import version CONF = config.CONF @@ -78,7 +78,7 @@ if __name__ == '__main__': config_files = [dev_conf] CONF(project='keystone', - version=version.VersionInfo('keystone').version_string(), + version=pbr.version.VersionInfo('keystone').version_string(), default_config_files=config_files) config.setup_logging(CONF) |