diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-08-22 22:38:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-08-22 22:38:56 +0000 |
| commit | ce408112fa316b5d21739acbc534ffb6bae3cb5f (patch) | |
| tree | 5af0d290d3b23f4e72fd67de14dafa732e891724 | |
| parent | 60eced8ce0e214090c2b9d7e5548e07506bc8b73 (diff) | |
| parent | b8386945a5f2018e2ce41f746e7e008f60cdc900 (diff) | |
Merge changes I6604ea0e,I98a078e4
* changes:
Sample changes to support v2.0 api
Sample changes to support v2.0 api
| -rw-r--r-- | keystone/content/common/samples/RAX-GRP-group.json (renamed from keystone/content/common/samples/group.json) | 0 | ||||
| -rw-r--r-- | keystone/content/common/samples/RAX-GRP-group.xml (renamed from keystone/content/common/samples/group.xml) | 0 | ||||
| -rw-r--r-- | keystone/content/common/samples/RAX-GRP-groups.json (renamed from keystone/content/common/samples/groups.json) | 0 | ||||
| -rw-r--r-- | keystone/content/common/samples/RAX-GRP-groups.xml (renamed from keystone/content/common/samples/groups.xml) | 0 | ||||
| -rw-r--r-- | keystone/content/common/samples/roleRef.json | 7 | ||||
| -rw-r--r-- | keystone/content/common/samples/roleRef.xml | 4 | ||||
| -rw-r--r-- | keystone/content/common/samples/roleRefs.json | 13 | ||||
| -rw-r--r-- | keystone/content/common/samples/roleRefs.xml | 9 |
8 files changed, 0 insertions, 33 deletions
diff --git a/keystone/content/common/samples/group.json b/keystone/content/common/samples/RAX-GRP-group.json index 0ec60c60..0ec60c60 100644 --- a/keystone/content/common/samples/group.json +++ b/keystone/content/common/samples/RAX-GRP-group.json diff --git a/keystone/content/common/samples/group.xml b/keystone/content/common/samples/RAX-GRP-group.xml index 0f285307..0f285307 100644 --- a/keystone/content/common/samples/group.xml +++ b/keystone/content/common/samples/RAX-GRP-group.xml diff --git a/keystone/content/common/samples/groups.json b/keystone/content/common/samples/RAX-GRP-groups.json index a85ed112..a85ed112 100644 --- a/keystone/content/common/samples/groups.json +++ b/keystone/content/common/samples/RAX-GRP-groups.json diff --git a/keystone/content/common/samples/groups.xml b/keystone/content/common/samples/RAX-GRP-groups.xml index a429fdb3..a429fdb3 100644 --- a/keystone/content/common/samples/groups.xml +++ b/keystone/content/common/samples/RAX-GRP-groups.xml diff --git a/keystone/content/common/samples/roleRef.json b/keystone/content/common/samples/roleRef.json deleted file mode 100644 index 92bd57aa..00000000 --- a/keystone/content/common/samples/roleRef.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "roleRef": { - "id": 1, - "roleId": "admin", - "tenantId": "one" - } -} diff --git a/keystone/content/common/samples/roleRef.xml b/keystone/content/common/samples/roleRef.xml deleted file mode 100644 index 29115ee2..00000000 --- a/keystone/content/common/samples/roleRef.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<roleRef xmlns="http://docs.openstack.org/identity/api/v2.0" - id="1" roleId="Admin" tenantId="tenantId"/> diff --git a/keystone/content/common/samples/roleRefs.json b/keystone/content/common/samples/roleRefs.json deleted file mode 100644 index 29e7f330..00000000 --- a/keystone/content/common/samples/roleRefs.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "roleRefs": [ - { - "id": 1, - "roleId": "admin", - "tenantId": "one" - }, { - "id": 2, - "roleId": "test", - "tenantId": "two" - } - ] -} diff --git a/keystone/content/common/samples/roleRefs.xml b/keystone/content/common/samples/roleRefs.xml deleted file mode 100644 index bd7ee983..00000000 --- a/keystone/content/common/samples/roleRefs.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<roleRefs - xmlns="http://docs.openstack.org/identity/api/v2.0"> - <roleRef xmlns="http://docs.openstack.org/identity/api/v2.0" - roleId="admin" id="3" tenantId="tenantId"/> - <roleRef xmlns="http://docs.openstack.org/identity/api/v2.0" - roleId="test" id="4" tenantId="tenantId"/> -</roleRefs> |