Merge "Fix outdated URLs and some minor fixes"
This commit is contained in:
commit
f860668d71
@ -1,10 +1,9 @@
|
||||
If you would like to contribute to the development of OpenStack,
|
||||
you must follow the steps in the "If you're a developer"
|
||||
section of this page: [http://wiki.openstack.org/HowToContribute](http://wiki.openstack.org/HowToContribute#If_you.27re_a_developer:)
|
||||
you must follow the steps in this page: [http://docs.openstack.org/infra/manual/developers.html](http://docs.openstack.org/infra/manual/developers.html)
|
||||
|
||||
Once those steps have been completed, changes to OpenStack
|
||||
should be submitted for review via the Gerrit tool, following
|
||||
the workflow documented at [http://wiki.openstack.org/GerritWorkflow](http://wiki.openstack.org/GerritWorkflow).
|
||||
the workflow documented at [http://docs.openstack.org/infra/manual/developers.html#development-workflow](http://docs.openstack.org/infra/manual/developers.html#development-workflow).
|
||||
|
||||
Pull requests submitted through GitHub will be ignored.
|
||||
|
||||
|
10
README.rst
10
README.rst
@ -9,8 +9,8 @@ See the `OpenStack CLI guide`_ for information on how to use the ``cinder``
|
||||
command-line tool. You may also want to look at the
|
||||
`OpenStack API documentation`_.
|
||||
|
||||
.. _OpenStack CLI Guide: http://docs.openstack.org/cli/quick-start/content/
|
||||
.. _OpenStack API documentation: http://docs.openstack.org/api/
|
||||
.. _OpenStack CLI Guide: http://docs.openstack.org/user-guide/content/ch_cli.html
|
||||
.. _OpenStack API documentation: http://developer.openstack.org/api-ref.html
|
||||
|
||||
The project is hosted on `Launchpad`_, where bugs can be filed. The code is
|
||||
hosted on `Github`_. Patches must be submitted using `Gerrit`_, *not* Github
|
||||
@ -20,11 +20,11 @@ pull requests.
|
||||
.. _Launchpad: https://launchpad.net/python-cinderclient
|
||||
.. _Gerrit: http://docs.openstack.org/infra/manual/developers.html#development-workflow
|
||||
|
||||
This code a fork of `Jacobian's python-cloudservers`__ If you need API support
|
||||
This code is a fork of `Jacobian's python-cloudservers`__. If you need API support
|
||||
for the Rackspace API solely or the BSD license, you should use that repository.
|
||||
python-cinderclient is licensed under the Apache License like the rest of OpenStack.
|
||||
|
||||
__ http://github.com/jacobian/python-cloudservers
|
||||
__ https://github.com/jacobian-archive/python-cloudservers
|
||||
|
||||
.. contents:: Contents:
|
||||
:local:
|
||||
@ -110,7 +110,7 @@ You'll find complete documentation on the shell by running
|
||||
list-extensions List all the os-api extensions that are available.
|
||||
|
||||
Optional arguments:
|
||||
-d, --debug Print debugging output
|
||||
-d, --debug Print debugging output
|
||||
--os-username <auth-user-name>
|
||||
Defaults to env[OS_USERNAME].
|
||||
--os-password <auth-password>
|
||||
|
@ -1903,11 +1903,9 @@ def do_manage(cs, args):
|
||||
# dictionary so that it is consistent with what the user specified on the
|
||||
# CLI.
|
||||
|
||||
if hasattr(args, 'source_name') and \
|
||||
args.source_name is not None:
|
||||
if hasattr(args, 'source_name') and args.source_name is not None:
|
||||
ref_dict['source-name'] = args.source_name
|
||||
if hasattr(args, 'source_id') and \
|
||||
args.source_id is not None:
|
||||
if hasattr(args, 'source_id') and args.source_id is not None:
|
||||
ref_dict['source-id'] = args.source_id
|
||||
|
||||
volume = cs.volumes.manage(host=args.host,
|
||||
|
@ -94,7 +94,7 @@ class VolumeBackupManager(base.ManagerWithFind):
|
||||
"""Export volume backup metadata record.
|
||||
|
||||
:param backup_service: Backup service to use for importing the backup
|
||||
:param backup_urlBackup URL for importing the backup metadata
|
||||
:param backup_url: Backup URL for importing the backup metadata
|
||||
:rtype: :class:`VolumeBackup`
|
||||
"""
|
||||
body = {'backup-record': {'backup_service': backup_service,
|
||||
|
Loading…
Reference in New Issue
Block a user