diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-01-08 23:07:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-01-08 23:07:06 +0000 |
| commit | b7a130ff4417040afa97a5d73270b531ea603e63 (patch) | |
| tree | eb20d7adf8aab39cf12a742ad58f05bb6f8fb0d4 /doc/source/commands.rst | |
| parent | 1dd61125017beec9b6e29010050694c2068700fd (diff) | |
| parent | a0c63dedf41bfa9549d6b95902b91f7bfb2b5f55 (diff) | |
| download | python-openstackclient-b7a130ff4417040afa97a5d73270b531ea603e63.tar.gz | |
Merge "Command doc: federation protocol"
Diffstat (limited to 'doc/source/commands.rst')
| -rw-r--r-- | doc/source/commands.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/source/commands.rst b/doc/source/commands.rst index 8726e9f2..4f8b5579 100644 --- a/doc/source/commands.rst +++ b/doc/source/commands.rst @@ -83,6 +83,7 @@ referring to both Compute and Volume quotas. * ``ec2 cedentials``: (**Identity**) AWS EC2-compatible credentials * ``endpoint``: (**Identity**) the base URL used to contact a specific service * ``extension``: (**Compute**, **Identity**, **Volume**) OpenStack server API extensions +* ``federation protocol``: (**Identity**) the underlying protocol used while federating identities * ``flavor``: (**Compute**) predefined server configurations: ram, root disk, etc * ``group``: (**Identity**) a grouping of users * ``host``: Compute - the physical computer running a hypervisor |