diff options
| author | Yogeshwar Srikrishnan <yoga80@yahoo.com> | 2011-06-22 17:35:50 -0500 |
|---|---|---|
| committer | Yogeshwar Srikrishnan <yoga80@yahoo.com> | 2011-06-22 17:35:50 -0500 |
| commit | fb06f3f5ae05a55fc13f2f0c8ced77ab1f6dd98e (patch) | |
| tree | d741f5c327c9ad08b6f2a3c886ff81b22f702cd4 | |
| parent | 4ca8e1b28682d87cbf156d886d99906a801ded8d (diff) | |
| parent | 0e5dcba3e9c91e310828f4eb9de8b97c018d0544 (diff) | |
| download | keystone-fb06f3f5ae05a55fc13f2f0c8ced77ab1f6dd98e.tar.gz keystone-fb06f3f5ae05a55fc13f2f0c8ced77ab1f6dd98e.tar.xz keystone-fb06f3f5ae05a55fc13f2f0c8ced77ab1f6dd98e.zip | |
Merge remote branch 'rackspace/master'
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | tools/pip-requires-dev | 3 |
2 files changed, 2 insertions, 5 deletions
@@ -88,7 +88,7 @@ $ pip install -r tools/pip-requires-testing # Installing Development Dependencies This will install libraries used for development and testing -$ pip install -r tools/pip-requires-dev +$ pip install -r tools/pip-requires-development </pre> @@ -231,7 +231,7 @@ Initial support for using keystone as nova's identity component has been started ln -s keystone/keystone nova/keystone # run nova-api based on the paste config in keystone - nova/bin/nova-api --api_paste_config=keystone/docs/nova-api-paste.ini + nova/bin/nova-api --api_paste_config=keystone/examples/paste/nova-api-paste.ini Assuming you added the test data using bin/sampledata.sh, you can then use joeuser/secrete diff --git a/tools/pip-requires-dev b/tools/pip-requires-dev deleted file mode 100644 index efe417e7..00000000 --- a/tools/pip-requires-dev +++ /dev/null @@ -1,3 +0,0 @@ -DTest -WebTest -sphinx |