diff options
| author | Yogeshwar Srikrishnan <yoga80@yahoo.com> | 2011-06-28 16:49:12 -0500 |
|---|---|---|
| committer | Yogeshwar Srikrishnan <yoga80@yahoo.com> | 2011-06-28 16:49:12 -0500 |
| commit | 260dd3b2da352e2e2d56559999e726ff43fd20dc (patch) | |
| tree | aa6a3053db457d5f9d301776a6d955619a534bf6 | |
| parent | 6f3c42c02f0fe1a1d48297fffb691d190e98cb8e (diff) | |
| parent | bb7303d96e65226ad428e08db9463231bcb4274c (diff) | |
| download | keystone-260dd3b2da352e2e2d56559999e726ff43fd20dc.tar.gz keystone-260dd3b2da352e2e2d56559999e726ff43fd20dc.tar.xz keystone-260dd3b2da352e2e2d56559999e726ff43fd20dc.zip | |
Merge remote branch 'rackspace/master'
| -rwxr-xr-x | doc/guide/src/docbkx/identitydevguide.xml | 2 | ||||
| -rw-r--r-- | keystone/content/identitydevguide.pdf | bin | 303240 -> 305127 bytes | |||
| l--------- | keystone/samples | 1 | ||||
| -rwxr-xr-x | keystone/server.py | 4 |
4 files changed, 3 insertions, 4 deletions
diff --git a/doc/guide/src/docbkx/identitydevguide.xml b/doc/guide/src/docbkx/identitydevguide.xml index e526d23e..18426a67 100755 --- a/doc/guide/src/docbkx/identitydevguide.xml +++ b/doc/guide/src/docbkx/identitydevguide.xml @@ -60,7 +60,7 @@ </copyright> <releaseinfo>API v2.0</releaseinfo> <productname>Keystone - OpenStack Identity</productname> - <pubdate>2011-06-21</pubdate> + <pubdate>2011-06-22</pubdate> <legalnotice role="apache2"> <annotation> <remark>Copyright details are filled in by the template.</remark> diff --git a/keystone/content/identitydevguide.pdf b/keystone/content/identitydevguide.pdf Binary files differindex 9b5fb8dc..f2ab9251 100644 --- a/keystone/content/identitydevguide.pdf +++ b/keystone/content/identitydevguide.pdf diff --git a/keystone/samples b/keystone/samples deleted file mode 120000 index 18bac956..00000000 --- a/keystone/samples +++ /dev/null @@ -1 +0,0 @@ -../doc/guide/src/docbkx/samples
\ No newline at end of file diff --git a/keystone/server.py b/keystone/server.py index 4f4fa483..4200342d 100755 --- a/keystone/server.py +++ b/keystone/server.py @@ -566,7 +566,7 @@ class KeystoneAPI(wsgi.Router): conditions=dict(method=["GET"])) mapper.connect("/v2.0/identity.wadl", controller=static_files_controller, - action="get_identity_wadl", + action="get_wadl_contract", conditions=dict(method=["GET"])) mapper.connect("/v2.0/xsd/{xsd}", controller=static_files_controller, @@ -778,7 +778,7 @@ class KeystoneAdminAPI(wsgi.Router): conditions=dict(method=["GET"])) mapper.connect("/v2.0/identity.wadl", controller=static_files_controller, - action="get_identity_wadl", + action="get_wadl_contract", conditions=dict(method=["GET"])) mapper.connect("/v2.0/xsd/{xsd}", controller=static_files_controller, |