Merge lp://staging/~gandelman-a/ubuntu/precise/python-cinderclient/trunk into lp://staging/~ubuntu-cloud-archive/ubuntu/precise/python-cinderclient/trunk
Proposed by
Adam Gandelman
Status: | Approved |
---|---|
Approved by: | Chuck Short |
Approved revision: | 7 |
Proposed branch: | lp://staging/~gandelman-a/ubuntu/precise/python-cinderclient/trunk |
Merge into: | lp://staging/~ubuntu-cloud-archive/ubuntu/precise/python-cinderclient/trunk |
Diff against target: |
3386 lines (+1838/-424) 41 files modified
.gitignore (+0/-13) .gitreview (+0/-4) AUTHORS (+7/-0) ChangeLog (+465/-0) MANIFEST.in (+2/-7) PKG-INFO (+2/-1) cinderclient/__init__.py (+36/-0) cinderclient/client.py (+111/-62) cinderclient/exceptions.py (+11/-8) cinderclient/openstack/common/setup.py (+84/-46) cinderclient/openstack/common/version.py (+148/-0) cinderclient/shell.py (+22/-8) cinderclient/utils.py (+14/-6) cinderclient/v1/client.py (+8/-5) cinderclient/v1/contrib/list_extensions.py (+47/-0) cinderclient/v1/shell.py (+131/-10) cinderclient/v1/volume_snapshots.py (+19/-0) cinderclient/v1/volume_types.py (+46/-1) cinderclient/v1/volumes.py (+51/-46) cinderclient/versioninfo (+1/-1) debian/changelog (+22/-0) debian/control (+6/-2) debian/copyright (+0/-5) openstack-common.conf (+7/-0) python_cinderclient.egg-info/PKG-INFO (+2/-1) python_cinderclient.egg-info/SOURCES.txt (+6/-2) python_cinderclient.egg-info/requires.txt (+1/-1) setup.py (+4/-1) tests/test_client.py (+0/-3) tests/test_http.py (+135/-17) tests/test_shell.py (+29/-36) tests/test_utils.py (+1/-0) tests/utils.py (+33/-5) tests/v1/contrib/test_list_extensions.py (+21/-0) tests/v1/fakes.py (+157/-42) tests/v1/test_auth.py (+83/-75) tests/v1/test_shell.py (+74/-9) tests/v1/test_types.py (+35/-0) tests/v1/test_volumes.py (+11/-2) tools/pip-requires (+1/-1) tools/test-requires (+5/-4) |
To merge this branch: | bzr merge lp://staging/~gandelman-a/ubuntu/precise/python-cinderclient/trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Cloud Archive Team | Pending | ||
Review via email: mp+142798@code.staging.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 7. By Adam Gandelman
-
* New upstream release for the Ubuntu Cloud Archive.
* New upstream release.
* New upstream release.
* debian/control: Add python-requests as a build dep
* debian/control: Add python-testtools and python-fixtures as a build dep.
* debian/control: add python-setuptools- git dependency
* debian/copyright: Removed remaining dh boilerplate template.