diff -Nru python-cinderclient-1.0.3.11.ge7cfd77+git201304091131~raring/AUTHORS python-cinderclient-1.0.3.12.gdca8dbd+git201304160401~raring/AUTHORS --- python-cinderclient-1.0.3.11.ge7cfd77+git201304091131~raring/AUTHORS 2013-04-09 15:34:14.000000000 +0000 +++ python-cinderclient-1.0.3.12.gdca8dbd+git201304160401~raring/AUTHORS 2013-04-16 08:03:58.000000000 +0000 @@ -11,6 +11,7 @@ Clay Gerrard Cory Stone Dan Prince +Davanum Srinivas Dean Troyer Dirk Mueller Doug Hellmann diff -Nru python-cinderclient-1.0.3.11.ge7cfd77+git201304091131~raring/ChangeLog python-cinderclient-1.0.3.12.gdca8dbd+git201304160401~raring/ChangeLog --- python-cinderclient-1.0.3.11.ge7cfd77+git201304091131~raring/ChangeLog 2013-04-09 15:34:14.000000000 +0000 +++ python-cinderclient-1.0.3.12.gdca8dbd+git201304160401~raring/ChangeLog 2013-04-16 08:03:58.000000000 +0000 @@ -1,3 +1,13 @@ +commit dca8dbd1c840b53bbe1c36c78f0df4d2a6b16445 +Author: Davanum Srinivas +Date: Sun Apr 7 20:42:35 2013 -0400 + + Sync with oslo-incubator copy of setup.py and version.py + + Keep up with the changes to the master copy + + Change-Id: I24522c7de91c2dea0f7e4b8cac2a27ff162df7f1 + commit e7cfd77ba3a378bd811e62acb88a7fa8dff78e3a Merge: c5f542f fd3351f Author: Jenkins @@ -17,14 +27,6 @@ Change-Id: I013b849508beac5c9fe5c6f9d4cdfae54676c29c - HACKING | 4 ++-- - cinderclient/shell.py | 3 ++- - cinderclient/v1/shell.py | 2 +- - cinderclient/v1/volumes.py | 51 +++++++++++++--------------------------------- - cinderclient/v2/shell.py | 2 +- - cinderclient/v2/volumes.py | 2 +- - 6 files changed, 21 insertions(+), 43 deletions(-) - commit c5f542fd5ab53fcec491240c9b7d0447b8294499 Merge: 480e0f8 952970a Author: Jenkins @@ -63,9 +65,6 @@ Change-Id: I24878f1bb1693af13b2a7f0f7d6fe455f8747e91 - cinderclient/client.py | 1 - - 1 file changed, 1 deletion(-) - commit 130963e93939759e800c45d79b2fdddc9cdbe234 Author: Eric Harney Date: Thu Apr 4 16:39:43 2013 -0400 @@ -74,9 +73,6 @@ Change-Id: I07b0ea54993d5b00060e1dfcdfc10663d091254b - cinderclient/v1/volume_types.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - commit 952970acbd1bf926303d84881510c175b5395e98 Author: Eric Harney Date: Thu Apr 4 10:30:37 2013 -0400 @@ -87,9 +83,6 @@ Change-Id: Idb2c5f23a1c57676984ffa33f64d27c461b0de15 - cinderclient/client.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - commit c83e4a4ba9b8bb66fb2ace91e123d30f16bcc5c1 Author: John Griffith Date: Tue Apr 2 17:12:22 2013 -0600 @@ -104,9 +97,6 @@ Change-Id: Iabf7ee8b0fd253447d1a65bc1b12906d26176286 - tools/pip-requires | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - commit 03a4806d972ac150e717451566e9c4c35a141d8f Author: Flaper Fesp Date: Wed Feb 27 14:47:44 2013 +0100 @@ -146,12 +136,6 @@ Change-Id: Idb7d06954c29e003f68a0c4aa0b80ecc7017cbc9 - cinderclient/openstack/common/strutils.py | 133 ++++++++++++++++++++++++++++++ - cinderclient/shell.py | 8 +- - cinderclient/utils.py | 14 ++-- - openstack-common.conf | 2 +- - 4 files changed, 145 insertions(+), 12 deletions(-) - commit 7369310622224073ecbef4ab84a48c2a873a56b9 Merge: d290b92 4d76d3c Author: Jenkins @@ -169,9 +153,6 @@ Change-Id: I8849ab8f552801b8a317cd0394251c2db1ba8e9a - cinderclient/shell.py | 30 ++++++++++++++++++++---------- - 1 file changed, 20 insertions(+), 10 deletions(-) - commit d290b92753c0146282cb0ee2763bdf90b9d84ed5 Author: Mark McLoughlin Date: Mon Mar 25 21:59:37 2013 +0000 @@ -183,9 +164,6 @@ Change-Id: Ic4bfa1aee3a4b6a7588be3678ac033a1b13e2b18 - tools/rfc.sh | 145 ----------------------------------------------------------- - 1 file changed, 145 deletions(-) - commit 174af7a06e77c71a2d9698b115b1e47db05d89ae Merge: 704cae0 36ba504 Author: Jenkins @@ -205,9 +183,6 @@ Change-Id: Icebc17a1575e17cfd9597581546dca4732b9a8ef - run_tests.sh | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - commit 4d76d3c481d4dfd95ebb5f7fe1c2d6161b7d2135 Author: john-griffith Date: Thu Mar 21 16:58:28 2013 -0600 @@ -219,16 +194,6 @@ Change-Id: Iae8a86b31e63b9e56d6ef0bee7e03f4089aa8138 - cinderclient/v1/quotas.py | 3 ++- - cinderclient/v1/shell.py | 10 +++++++++- - cinderclient/v2/quotas.py | 3 ++- - cinderclient/v2/shell.py | 10 +++++++++- - tests/v1/fakes.py | 5 +++++ - tests/v1/test_quotas.py | 5 +++++ - tests/v2/fakes.py | 5 +++++ - tests/v2/test_quotas.py | 5 +++++ - 8 files changed, 42 insertions(+), 4 deletions(-) - commit 36ba504d52a53fb6108896f93cab81bfd0cea670 Author: Eric Harney Date: Wed Mar 20 13:06:07 2013 -0400 @@ -247,9 +212,6 @@ Change-Id: Ib748835ad1f94fb901b4941dc5e3797b719e197f - cinderclient/shell.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - commit 020778ddd942e762a5e543e41bc3f4d95df3b91e Author: john-griffith Date: Tue Mar 19 00:24:32 2013 -0600 @@ -268,19 +230,6 @@ Change-Id: I169b1c01380ef653a6a25eb8946b9a06d6419e62 - doc/source/api.rst | 67 ------------------------- - doc/source/index.rst | 86 +++++++++++++++++++------------- - doc/source/ref/backup_schedules.rst | 60 ---------------------- - doc/source/ref/exceptions.rst | 14 ------ - doc/source/ref/flavors.rst | 35 ------------- - doc/source/ref/images.rst | 54 -------------------- - doc/source/ref/index.rst | 12 ----- - doc/source/ref/ipgroups.rst | 46 ----------------- - doc/source/ref/servers.rst | 73 --------------------------- - doc/source/releases.rst | 99 ------------------------------------- - doc/source/shell.rst | 4 +- - 11 files changed, 54 insertions(+), 496 deletions(-) - commit f2ac10f282d2c5def47487d845d4aa18e7054917 Author: Cory Stone Date: Fri Mar 15 10:19:14 2013 -0500 @@ -292,9 +241,6 @@ Change-Id: I233e37cceb7079ec78b9bde093967dea9ad94441 Fixes: bug #1155655 - cinderclient/client.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - commit 458ff24513e39e9ebf669ea1155fc2d1c919f042 Author: Ollie Leahy Date: Wed Feb 20 15:49:52 2013 +0000 @@ -305,9 +251,6 @@ Change-Id: Ia105e8a561b8d45c60e9a3c6ed46a953cc6df96f - cinderclient/client.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - commit 4c375935d1b7d09fead75c0bc66580b27b987350 Merge: a35ebc2 636ec5e Author: Jenkins @@ -333,9 +276,6 @@ Change-Id: I3af4ea0e3657a2359fda55c890a030fabaad129d Signed-off-by: Josh Durgin - cinderclient/v1/shell.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - commit 662cbb95e16be30bb1358e8aa502dce68964c5c5 Author: john-griffith Date: Wed Feb 13 21:47:03 2013 -0700 @@ -349,9 +289,6 @@ Change-Id: I337068d45fa848d8621add29c91e4a43c9d7dc72 - cinderclient/v1/shell.py | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) - commit 636ec5eccda3f4caef90db3fe4e0c19df1bd348d Author: Mike Perez Date: Sat Feb 2 13:26:18 2013 -0800 @@ -365,33 +302,6 @@ Change-Id: I004134d9f528a6eadefdaa89eb48087bcae2691f - cinderclient/client.py | 1 + - cinderclient/shell.py | 5 +- - cinderclient/v2/__init__.py | 17 + - cinderclient/v2/client.py | 78 ++++ - cinderclient/v2/contrib/__init__.py | 15 + - cinderclient/v2/contrib/list_extensions.py | 47 ++ - cinderclient/v2/limits.py | 78 ++++ - cinderclient/v2/quota_classes.py | 51 +++ - cinderclient/v2/quotas.py | 53 +++ - cinderclient/v2/shell.py | 697 +++++++++++++++++++++++++++++ - cinderclient/v2/volume_snapshots.py | 116 +++++ - cinderclient/v2/volume_types.py | 108 +++++ - cinderclient/v2/volumes.py | 308 +++++++++++++ - tests/test_client.py | 5 + - tests/v1/test_shell.py | 2 +- - tests/v2/__init__.py | 15 + - tests/v2/contrib/__init__.py | 0 - tests/v2/contrib/test_list_extensions.py | 36 ++ - tests/v2/fakes.py | 317 +++++++++++++ - tests/v2/test_auth.py | 390 ++++++++++++++++ - tests/v2/test_quota_classes.py | 42 ++ - tests/v2/test_quotas.py | 47 ++ - tests/v2/test_shell.py | 159 +++++++ - tests/v2/test_types.py | 50 +++ - tests/v2/test_volumes.py | 87 ++++ - 25 files changed, 2721 insertions(+), 3 deletions(-) - commit 20dcc85fadb84c3a9abbbdc8d5ee599402ec1488 Merge: 8d43cd9 8cc89fd Author: Jenkins @@ -412,11 +322,6 @@ Change-Id: I1ed9b3bd6bdbbbb451298a3c397e6e7a06c0cabd Signed-off-by: Chuck Short - cinderclient/client.py | 8 ++------ - tests/utils.py | 1 - - tools/pip-requires | 2 +- - 3 files changed, 3 insertions(+), 8 deletions(-) - commit c5cd7e4862a9ee9bec655cf4aaf96f2d2f67df97 Author: Dan Prince Date: Thu Feb 7 11:28:51 2013 -0500 @@ -434,9 +339,6 @@ Change-Id: I27a09e0d49befa3751031582d1b152677822041f - setup.py | 1 + - 1 file changed, 1 insertion(+) - commit 76126ebd2cb5070dd6cfaaaefd3a90c2c09fb3c3 Merge: 7053498 81cbbcc Author: Jenkins @@ -458,9 +360,6 @@ Change-Id: I3c4440fc238d8c8136a9bd93a0040668f82bda6e - cinderclient/shell.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - commit 7053498f3d8e6d772fc21a7f13e6940b4b28e84a Author: Nathan Reller Date: Tue Feb 5 19:00:26 2013 -0500 @@ -475,10 +374,6 @@ Change-Id: I8c093df59ea4de2e2a1b7cf3ac7c4624c159fb66 Implements: blueprint encrypt-cinder-volumes - cinderclient/v1/shell.py | 3 +-- - tests/v1/test_shell.py | 20 ++++++++++++++++++++ - 2 files changed, 21 insertions(+), 2 deletions(-) - commit b49f72735e3081b7784a9fbaa9252fd99f654ce9 Merge: f0a6dee 33c897d Author: Jenkins @@ -497,13 +392,6 @@ Change-Id: Ice2ea2f99f5aacbd476075d12077b7287d824585 - MANIFEST.in | 1 - - cinderclient/__init__.py | 29 ++-- - cinderclient/openstack/common/setup.py | 223 +++++++++++++------------------ - cinderclient/openstack/common/version.py | 146 ++++++-------------- - setup.py | 6 +- - 5 files changed, 149 insertions(+), 256 deletions(-) - commit 33c897d87e953479bfc80518f5e9750431b52869 Author: Frederic Lepied Date: Fri Jan 11 21:39:11 2013 +0100 @@ -516,13 +404,6 @@ Change-Id: Ifaa53d5c06e6d7d8e3d4d858672717954303bea7 Fixes: bug #1074125 - README.rst | 65 +++++++++++++++++++++++++-------------------------- - cinderclient/shell.py | 2 +- - doc/source/api.rst | 2 +- - doc/source/index.rst | 19 ++++----------- - doc/source/shell.rst | 25 +++++++++----------- - 5 files changed, 49 insertions(+), 64 deletions(-) - commit f0a6dee19f573d260f8028106e66842451f82e21 Merge: 55ae2c1 02eb985 Author: Jenkins @@ -545,9 +426,6 @@ Change-Id: I410360ca23388e93bcbbf3dce053cae99c84a431 - cinderclient/shell.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - commit 07ff48f1de5507faac197f463b418d78c9fd4e92 Author: john-griffith Date: Fri Jan 18 16:55:01 2013 -0700 @@ -561,10 +439,6 @@ Change-Id: Ia066d7dd06ccdb9b3a9221cf33086437624e65d8 - cinderclient/v1/shell.py | 8 ++++++++ - cinderclient/v1/volumes.py | 11 +++++++++++ - 2 files changed, 19 insertions(+) - commit 8d2e463ac431001e50f1de975df6adb5ed1b865a Merge: 9a064c3 fbddead Author: Jenkins @@ -587,17 +461,6 @@ Change-Id: I54d9a0b7dc22305ec60d779d6f19025a0b5dc785 - .gitignore | 2 ++ - .testr.conf | 4 ++++ - run_tests.sh | 63 +++++++++++++++++++++++++++++++++++++---------------- - setup.cfg | 8 ------- - setup.py | 1 - - tests/utils.py | 15 ++++++++++++- - tests/v1/utils.py | 29 ------------------------ - tools/test-requires | 7 +++--- - tox.ini | 29 +++++------------------- - 9 files changed, 73 insertions(+), 85 deletions(-) - commit fbddead1cba8ab43fecf9073d834395a2375f0b2 Author: Anita Kuno Date: Thu Jan 17 17:08:01 2013 +0000 @@ -608,9 +471,6 @@ Change-Id: If9608291f318057fc8fa61151328d6503a79d70d - cinderclient/shell.py | 4 ++++ - 1 file changed, 4 insertions(+) - commit 9a064c3d5c09bca9c5cb7e9ffc4277ac053820e0 Author: Avishay Traeger Date: Wed Jan 16 15:45:29 2013 +0200 @@ -622,11 +482,6 @@ Change-Id: Ief996f92aaf6d7a4fee0bce5ca45b92bee3f6990 Fixes: bug #1099866 - cinderclient/v1/shell.py | 34 +++++++++++++++++++++++++++++++++- - cinderclient/v1/volumes.py | 22 ++++++++++++++++++++++ - tests/test_shell.py | 4 ++-- - 3 files changed, 57 insertions(+), 3 deletions(-) - commit 61e2a4237f0d7a4c5c9591ac364a01c844309757 Merge: 06acb0c 765cb3d Author: Jenkins @@ -645,13 +500,6 @@ Change-Id: I97c120d69b6d30843009f6a297bb51299799f4ec - cinderclient/v1/shell.py | 25 +++++++++++++++++++++++++ - cinderclient/v1/volumes.py | 30 ++++++++++++++++++++++++++++++ - tests/v1/fakes.py | 15 +++++++++++++++ - tests/v1/test_shell.py | 15 +++++++++++++++ - tests/v1/test_volumes.py | 13 +++++++++++-- - 5 files changed, 96 insertions(+), 2 deletions(-) - commit 06acb0c009ac53777884cf5b0aa8942184d06622 Author: Monty Taylor Date: Mon Dec 24 21:49:34 2012 -0600 @@ -662,14 +510,6 @@ Change-Id: I13e068ca156f12114eaa3a65bdb557e4eb2c988d - tests/test_client.py | 3 --- - tests/test_shell.py | 43 ++++++++++++++++++++++++------------------- - tests/test_utils.py | 1 + - tests/utils.py | 4 ++-- - tests/v1/test_shell.py | 24 +++++++++++++++--------- - tools/test-requires | 7 ++++--- - 6 files changed, 46 insertions(+), 36 deletions(-) - commit bf7b86748a49455ae1545f01fe5cfc9b801223aa Merge: 9a49690 2473311 Author: Jenkins @@ -693,12 +533,6 @@ Change-Id: I4f9d04cb8a2aa05c978a2a5a926c9175ee3614bb - cinderclient/v1/contrib/list_extensions.py | 47 ++++++++++++++++++++++++++++++ - tests/v1/contrib/__init__.py | 0 - tests/v1/contrib/test_list_extensions.py | 21 +++++++++++++ - tests/v1/fakes.py | 30 +++++++++++++++++-- - 4 files changed, 96 insertions(+), 2 deletions(-) - commit 82e47d0866397b702ae777972add66b33afae69e Author: Dean Troyer Date: Thu Dec 13 12:01:07 2012 -0600 @@ -716,18 +550,6 @@ Change-Id: I71066ff7297f3b70c08b7ae1c8ae8b6a1b82bbae - cinderclient/client.py | 95 ++++++++++++++++++------------ - cinderclient/exceptions.py | 19 +++--- - cinderclient/shell.py | 17 ++++-- - cinderclient/v1/client.py | 6 +- - tests/test_http.py | 87 +++++++++++++++------------ - tests/test_shell.py | 6 -- - tests/utils.py | 30 +++++++++- - tests/v1/fakes.py | 109 ++++++++++++++++++---------------- - tests/v1/test_auth.py | 142 ++++++++++++++++++++++++--------------------- - tools/pip-requires | 2 +- - 10 files changed, 296 insertions(+), 217 deletions(-) - commit d3603535d2f47580bf49520048af1f27adea3e7c Author: Dean Troyer Date: Thu Dec 13 14:52:54 2012 -0600 @@ -743,9 +565,6 @@ Change-Id: I0d87ab6b3c2b35ff843323cb818915e03993a844 - cinderclient/client.py | 18 +++++++++++------- - 1 file changed, 11 insertions(+), 7 deletions(-) - commit e30724df5b55f5b989f294f82ad7209e150b3559 Author: Dean Troyer Date: Thu Dec 13 15:25:01 2012 -0600 @@ -757,11 +576,6 @@ Change-Id: Ic03b9e7d84c8db14f6e193ca2b478fd0d70d1299 - cinderclient/client.py | 34 ++++++++++++++++++---------------- - cinderclient/shell.py | 6 ++++-- - cinderclient/v1/client.py | 6 ++++-- - 3 files changed, 26 insertions(+), 20 deletions(-) - commit 24733119fe5da11bccf16d345f6f27cec8bbd06f Author: John Griffith Date: Thu Dec 13 21:21:55 2012 +0000 @@ -774,10 +588,6 @@ Change-Id: Iad2178deb66c328625fbff747e123044f9d86a88 - cinderclient/v1/shell.py | 9 +++++++++ - cinderclient/v1/volumes.py | 4 +++- - 2 files changed, 12 insertions(+), 1 deletion(-) - commit 9201cee6ef79dd4955f6f762e6adfaee65885ca1 Author: Monty Taylor Date: Fri Nov 30 14:22:54 2012 -0800 @@ -786,9 +596,6 @@ Change-Id: I6a8dd1c84df0a92c21f468c7dcad1ce79f69c463 - cinderclient/openstack/common/setup.py | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - commit 5adf79136042004ceb76d3d1e68e0ab08edf1917 Author: Monty Taylor Date: Fri Nov 30 14:05:54 2012 -0800 @@ -797,14 +604,6 @@ Change-Id: I81d6a279a52656720626357a1c4ca8bb382ef1f8 - .gitignore | 2 + - MANIFEST.in | 9 +- - cinderclient/__init__.py | 36 ++++++++ - cinderclient/openstack/common/version.py | 148 +++++++++++++++++++++++++++++++ - openstack-common.conf | 2 +- - setup.py | 4 +- - 6 files changed, 192 insertions(+), 9 deletions(-) - commit a74dee000e682b5b227cd9032df6719aa22ffb00 Merge: 3ca2c99 62eb92a Author: Jenkins @@ -830,10 +629,6 @@ Change-Id: I8f6cc6e02be8226914f65717dcb2e0367553e51f - cinderclient/v1/shell.py | 2 +- - tests/v1/fakes.py | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - commit 62eb92a1f2cffa5a81778018932b539f436b50f0 Author: Chuck Short Date: Tue Nov 20 09:41:28 2012 -0600 @@ -846,9 +641,6 @@ Change-Id: If5ef6be394e557b3554a80f1ad9b44d472c273b6 Signed-off-by: Chuck Short - tools/test-requires | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - commit 79dc21d17183fa78126515f9d8436c207fbed7b7 Author: Christian Berendt Date: Thu Nov 8 23:33:14 2012 +0100 @@ -866,10 +658,6 @@ Change-Id: I8f46f67b7fef472ac344bb74f80cf1b77c4c4745 - cinderclient/shell.py | 2 +- - tests/test_shell.py | 18 ++++++------------ - 2 files changed, 7 insertions(+), 13 deletions(-) - commit 112bd60d4e17ad435c274d52585f70faaaf9f70d Author: Cory Stone Date: Thu Nov 1 14:27:52 2012 -0500 @@ -886,12 +674,6 @@ Change-Id: I67bed02d65155f4a4d5d879bb233f56cc78849fa - cinderclient/client.py | 54 ++++++++++++++++------ - cinderclient/shell.py | 9 +++- - cinderclient/v1/client.py | 5 +- - tests/test_http.py | 113 ++++++++++++++++++++++++++++++++++++++++++++-- - 4 files changed, 159 insertions(+), 22 deletions(-) - commit 1abc0b4edfa70485cd32bac2060b1b223850752e Author: Alessandro Pilotti Date: Tue Nov 6 19:38:28 2012 +0200 @@ -907,10 +689,6 @@ Change-Id: Iafae444a43c76560020a84e3a1c5c8cb4b6860da - cinderclient/openstack/common/setup.py | 120 +++++++++++++++++++++------------ - openstack-common.conf | 7 ++ - 2 files changed, 85 insertions(+), 42 deletions(-) - commit dcbebd7b78235008e36fe6b8c8cc4a75f5031042 Author: John Griffith Date: Fri Nov 2 22:17:03 2012 +0000 @@ -919,12 +697,6 @@ This reverts commit 3b1eda3b3bb6678e9c9ec3e783e3e12b0c42f0a4 - cinderclient/client.py | 47 ++++++++++++----------------------- - cinderclient/shell.py | 8 +----- - cinderclient/v1/client.py | 5 ++-- - tests/test_http.py | 62 +---------------------------------------------- - 4 files changed, 19 insertions(+), 103 deletions(-) - commit 3b1eda3b3bb6678e9c9ec3e783e3e12b0c42f0a4 Author: Cory Stone Date: Thu Nov 1 14:27:52 2012 -0500 @@ -941,12 +713,6 @@ Change-Id: I75d9a13d6c4ba16a5da13d4bf5cad78a777d67d7 - cinderclient/client.py | 47 +++++++++++++++++++++++------------ - cinderclient/shell.py | 8 +++++- - cinderclient/v1/client.py | 5 ++-- - tests/test_http.py | 62 ++++++++++++++++++++++++++++++++++++++++++++++- - 4 files changed, 103 insertions(+), 19 deletions(-) - commit 7d3749e7c3c3f66900a4b08563a3b1e8d1dd0c35 Merge: 0288e7f a8be1b2 Author: Jenkins @@ -976,9 +742,6 @@ Change-Id: I2a716cd7076fb17fd5f2ceb94363eef0009e9bce - cinderclient/v1/shell.py | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - commit 92bd08b9e1082620d41e827db2eeade5da6c8e19 Merge: 4649420 942ab5c Author: Jenkins @@ -1000,9 +763,6 @@ Change-Id: Ib96fe0cac26f19e7d9f2aa01c71ba9762e4f8b8e Fixes: bug #1071003 - cinderclient/v1/volumes.py | 46 ---------------------------------------------- - 1 file changed, 46 deletions(-) - commit 4649420ca2e8e24c8e651d141839d62fbbb53416 Merge: c20d7d9 01dad32 Author: Jenkins @@ -1018,9 +778,6 @@ Change-Id: I24a7a5f423e99a9b6839b5f3a1b1fbf05297dc53 - .gitignore | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - commit 01dad32c07ad500f2e0000dcd24a50f5c47cd206 Author: Eric Harney Date: Tue Oct 23 15:40:17 2012 -0400 @@ -1038,9 +795,6 @@ Change-Id: I8e19a78bbc1ccb503ccd39dc3b904fc4f6f77858 - cinderclient/utils.py | 20 ++++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - commit 5a3a18d0cbe71ae7e150fe69efe5239601413f9b Author: Doug Hellmann Date: Mon Oct 22 18:42:34 2012 -0400 @@ -1053,9 +807,6 @@ Change-Id: I904372caf0a8eaa44dd048729b4d87e5333f04cc Signed-off-by: Doug Hellmann - setup.py | 1 + - 1 file changed, 1 insertion(+) - commit 942ab5c7fe901dd925ee38328c91e1cd160bc437 Author: John Griffith Date: Tue Oct 9 18:45:41 2012 -0600 @@ -1071,13 +822,6 @@ Change-Id: I3552de722f76389cfef6d4f12320720e022ebfac - cinderclient/v1/client.py | 4 +-- - cinderclient/v1/shell.py | 63 ++++++++++++++++++++++++++++++++++------- - cinderclient/v1/volume_types.py | 47 +++++++++++++++++++++++++++++- - tests/v1/fakes.py | 32 +++++++++++++++++++++ - tests/v1/test_types.py | 35 +++++++++++++++++++++++ - 5 files changed, 167 insertions(+), 14 deletions(-) - commit 7cba8eb7863705fcf0ef5c677cef2d334bd8ad26 Author: Clay Gerrard Date: Tue Aug 28 20:20:35 2012 +0000 @@ -1086,13 +830,6 @@ Change-Id: I06549f19b846d886fabd611d2167b894c4d02df8 - cinderclient/v1/shell.py | 34 ++++++++++++++++++++++++++++ - cinderclient/v1/volume_snapshots.py | 19 ++++++++++++++++ - cinderclient/v1/volumes.py | 19 ++++++++++++++++ - tests/v1/fakes.py | 36 +++++++++++++++++++++++++++++- - tests/v1/test_shell.py | 44 +++++++++++++++++++++++++++++++++++++ - 5 files changed, 151 insertions(+), 1 deletion(-) - commit 2e6be694c17d505bf52e339bccf6848776493ffe Author: Vishvananda Ishaya Date: Thu Sep 20 14:29:21 2012 +0000 @@ -1107,9 +844,6 @@ Change-Id: I1defafff3fd08f9b3510f70a455d49d470322d82 - cinderclient/v1/shell.py | 34 ++++++++++++++++++---------------- - 1 file changed, 18 insertions(+), 16 deletions(-) - commit 45bcdcaa2288a09c44306a3d0f0245df4d014897 Author: Adam Gandelman Date: Mon Sep 17 16:55:43 2012 -0700 @@ -1121,9 +855,6 @@ Change-Id: Ibce88b74cd19233820f9b00a4eacdabff6c71a6b - tests/v1/fakes.py | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - commit f2424f2921bba614603b1899aea638221f7efc1c Author: Rongze Zhu Date: Wed Sep 12 03:21:12 2012 +0000 @@ -1227,10 +958,6 @@ Change-Id: I0207a558edbfae8f5e69913c421c31e35fefcf4c - tests/v1/fakes.py | 633 +----------------------------------------------- - tests/v1/test_limits.py | 52 ---- - 2 files changed, 6 insertions(+), 679 deletions(-) - commit 67b5cba433e0b5472df51793e4b4290a9cfb096a Merge: 6313c93 5997e23 Author: Jenkins @@ -1280,10 +1007,6 @@ Change-Id: I5c4cd9cc56a7235036b6bab6641554b5919ffbb6 - tests/v1/fakes.py | 4 ++++ - tests/v1/test_volumes.py | 6 +++--- - 2 files changed, 7 insertions(+), 3 deletions(-) - commit 2313ddfc8c89074b3aaf269097236c5d93b59fdf Author: Clay Gerrard Date: Tue Sep 11 12:13:46 2012 -0500 @@ -1310,11 +1033,6 @@ Change-Id: I0c1bdbdabd9acc29133a48a798750323011f1f18 - cinderclient/client.py | 5 +++- - cinderclient/v1/client.py | 8 +++--- - tests/v1/test_auth.py | 70 +++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 78 insertions(+), 5 deletions(-) - commit a4d46014325f4f34ac9db82c863f5764c8560a3e Author: Rongze Zhu Date: Tue Sep 11 08:26:59 2012 +0000 @@ -1329,10 +1047,6 @@ Change-Id: If5d00a7f7991d78243e76a6e22031c185caee80a - cinderclient/v1/volumes.py | 30 ++++++++++++++++++++++++++++++ - tests/v1/test_volumes.py | 10 ++++++++++ - 2 files changed, 40 insertions(+) - commit 9ba6ed5a90fcdb8f5d8eb84ebbeab32bd73b5cec Author: Clay Gerrard Date: Wed Sep 5 14:51:57 2012 +0000 @@ -1341,13 +1055,6 @@ Change-Id: I9a8b538ad53960700ae7a57d1ceb09b05e3dc468 - cinderclient/v1/shell.py | 38 +++++++++++++++++++++++++++++++++++-- - cinderclient/v1/volume_snapshots.py | 1 + - tests/fakes.py | 18 +++++++++--------- - tests/v1/fakes.py | 23 ++++++++++++++++++++++ - tests/v1/test_shell.py | 21 ++++++++++++++++++++ - 5 files changed, 90 insertions(+), 11 deletions(-) - commit 081cc2e572f7a6ae238b82a56f4b52986f9ab2c2 Author: Avishay Traeger Date: Wed Sep 5 09:49:34 2012 +0300 @@ -1359,9 +1066,6 @@ Change-Id: Idd83af7a5ace58cb062545be221f93db0805438b - cinderclient/v1/volumes.py | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - commit f270f22cb051fbcf97f14d6c5b2ce1995a4aa601 Author: John Griffith Date: Thu Aug 16 15:48:55 2012 -0600 @@ -1374,17 +1078,6 @@ Change-Id: I7e3f8474476cbc03efb2fefcb8400f5fec85ddcb - README.rst | 2 + - cinderclient/v1/client.py | 10 ++++- - cinderclient/v1/limits.py | 79 ++++++++++++++++++++++++++++++++ - cinderclient/v1/quota_classes.py | 52 +++++++++++++++++++++ - cinderclient/v1/quotas.py | 54 ++++++++++++++++++++++ - cinderclient/v1/shell.py | 97 ++++++++++++++++++++++++++++++++++++++++ - tests/v1/test_limits.py | 52 +++++++++++++++++++++ - tests/v1/test_quota_classes.py | 42 +++++++++++++++++ - tests/v1/test_quotas.py | 47 +++++++++++++++++++ - 9 files changed, 433 insertions(+), 2 deletions(-) - commit a153f10b2b22ea81514ed07de46da90e33b345ec Merge: 08aa965 d7b09bd Author: Jenkins @@ -1409,9 +1102,6 @@ Change-Id: I4062904dfebf62dddb7ca2cb7b6c547c5026eb54 - doc/source/conf.py | 22 +++++++++++++--------- - 1 file changed, 13 insertions(+), 9 deletions(-) - commit 0a3745db1a70145e2054573d23995935857c384c Merge: f885e8b 0e1e447 Author: Jenkins @@ -1433,12 +1123,6 @@ Change-Id: If926bb3b8fa85d628aea197496cf976f71bcdd08 - README.rst | 54 ++++++++---------- - cinderclient/shell.py | 84 +++++++++++++++++++--------- - cinderclient/v1/shell.py | 141 ++++++++++++++++++++++++++++++++--------------- - doc/source/shell.rst | 4 +- - 4 files changed, 179 insertions(+), 104 deletions(-) - commit 0e1e44733b91f342fa70f7400777e3cc840061ac Author: Rongze Zhu Date: Thu Aug 23 16:55:43 2012 +0000 @@ -1451,9 +1135,6 @@ Change-Id: I75a86180a830d3ae875ee1aecd45f9a6e39f6e22 - cinderclient/v1/volumes.py | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - commit f885e8bade361602e0665cc8d176b8bd8ad0f779 Author: Vincent Hou Date: Wed Aug 22 16:21:29 2012 +0800 @@ -1464,9 +1145,6 @@ Change-Id: Ib36ff6eff6e84af25a8d799173524ced9e6d5d06 - tools/install_venv.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - commit d92d0b06a4819ad27d2870f3c3bf3adedfa41c34 Author: Clark Boylan Date: Tue Aug 21 14:32:58 2012 -0700 @@ -1479,9 +1157,6 @@ Change-Id: I439fc9742762e626610a7b0774ed1274cf38ceb7 - tools/test-requires | 1 + - 1 file changed, 1 insertion(+) - commit 0bba3857d19bdfbc7ac3a408b3889b92245ed812 Author: John Griffith Date: Tue Aug 14 17:59:27 2012 -0600 @@ -1493,9 +1168,6 @@ Change-Id: I64c72df78b8e091e37b8986aea5bd4980a0c7a75 - cinderclient/v1/shell.py | 25 ++++++++++++++++++++++++- - 1 file changed, 24 insertions(+), 1 deletion(-) - commit 75b6589ed0fdb3e93204334af944321113f79010 Author: Josh Durgin Date: Mon Aug 13 23:14:51 2012 -0700 @@ -1507,10 +1179,6 @@ Change-Id: I113e0dc557500ea52e64d810409548ed1ffafe90 Signed-off-by: Josh Durgin - cinderclient/v1/shell.py | 7 ++++++- - cinderclient/v1/volumes.py | 4 +++- - 2 files changed, 9 insertions(+), 2 deletions(-) - commit 937e80aa719319f24bc2eb18539716c8e8691285 Merge: 8e48619 332a720 Author: Jenkins @@ -1538,10 +1206,6 @@ Change-Id: Ice3c9a550dcc486208208074730da13c64a6719b - cinderclient/v1/shell.py | 6 +++++- - setup.py | 2 +- - 2 files changed, 6 insertions(+), 2 deletions(-) - commit ac7d98b84f7a5fdfd98df1ffd43da3e5ef110fcf Author: Chmouel Boudjnah Date: Thu Aug 9 14:15:40 2012 +0000 @@ -1550,10 +1214,6 @@ Change-Id: I4bcdb482149271253e12f43fb85a663b5c938a14 - tools/cinder.bash_completion | 15 +++++++++++++++ - tools/nova.bash_completion | 15 --------------- - 2 files changed, 15 insertions(+), 15 deletions(-) - commit f29d1c8349069a39776cf8ec5cc27ecc7e8d150a Author: jakedahn Date: Sun Aug 5 17:32:00 2012 -0700 @@ -1566,11 +1226,6 @@ Change-Id: I8eb69574d3a0510bb6ac8b14b3e2a50a33542f11 - cinderclient/v1/shell.py | 26 ++++++++++++++++++++++++-- - cinderclient/v1/volume_snapshots.py | 24 +++++++++++++++++++----- - cinderclient/v1/volumes.py | 24 +++++++++++++++++++----- - 3 files changed, 62 insertions(+), 12 deletions(-) - commit 778d2d90227771976f9b98ab686dbe1d88154806 Author: John Griffith Date: Tue Jul 24 19:29:02 2012 -0600 @@ -1582,9 +1237,6 @@ Change-Id: Iaa0c9fd5edac8b48d92ee9722ea5d31d8249cd67 - cinderclient/v1/volumes.py | 28 ++++++++++++++++++++++++++-- - 1 file changed, 26 insertions(+), 2 deletions(-) - commit 1a32f024ce565d19a362d615cfefda2a59e01f54 Author: Chuck Short Date: Wed Jun 27 13:21:26 2012 -0400 @@ -1596,9 +1248,6 @@ Change-Id: I71a4b3303a354c0483c5da6a786ee6ae39388c77 Signed-off-by: Chuck Short - tools/test-requires | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - commit 55464f78214c16dc64ab0afa15c915217c769fd0 Author: Monty Taylor Date: Mon Jun 25 11:15:53 2012 -0500 @@ -1607,12 +1256,6 @@ Change-Id: I527accfa7352ececaabad1213cf2c0b2ef115930 - .gitignore | 3 +- - MANIFEST.in | 1 + - cinderclient/openstack/common/setup.py | 174 ++++++++++++++++++++++++++++----- - setup.py | 2 +- - 4 files changed, 156 insertions(+), 24 deletions(-) - commit 0daf35ad08bc7fb2e2e320fb04b5169ce319fa80 Author: Anthony Young Date: Wed Jun 20 17:09:59 2012 -0700 @@ -1623,9 +1266,6 @@ Change-Id: I5beb2638a48776e04bfd95281da838c5b710ea46 - cinderclient/v1/volume_snapshots.py | 8 ++++++++ - 1 file changed, 8 insertions(+) - commit 12d162d0ee24ea0e0c696f0f11adfd6ac3bee810 Author: Anthony Young Date: Thu May 31 14:47:30 2012 -0700 @@ -1637,11 +1277,6 @@ Change-Id: Icad4eada0cf16a0f49d9a52e593bede0fc0c5289 - cinderclient/v1/volumes.py | 113 +++++++++++++++++++++++++++++++++++++++++++++ - tests/v1/fakes.py | 25 ++++++++++ - tests/v1/test_volumes.py | 52 +++++++++++++++++++++ - 3 files changed, 190 insertions(+) - commit 7816b3dc31722774be61ddf0047f444dfdff6f05 Merge: 7547dad 314fa34 Author: Jenkins @@ -1662,38 +1297,6 @@ Change-Id: I3ae14ac735d9b4c0b534eac9a9c142f8ccaac1b9 - MANIFEST.in | 2 +- - doc/.gitignore | 1 + - doc/Makefile | 90 ++++++++++++++++ - doc/source/api.rst | 67 ++++++++++++ - doc/source/conf.py | 201 ++++++++++++++++++++++++++++++++++++ - doc/source/index.rst | 45 ++++++++ - doc/source/ref/backup_schedules.rst | 60 +++++++++++ - doc/source/ref/exceptions.rst | 14 +++ - doc/source/ref/flavors.rst | 35 +++++++ - doc/source/ref/images.rst | 54 ++++++++++ - doc/source/ref/index.rst | 12 +++ - doc/source/ref/ipgroups.rst | 46 +++++++++ - doc/source/ref/servers.rst | 73 +++++++++++++ - doc/source/releases.rst | 99 ++++++++++++++++++ - doc/source/shell.rst | 52 ++++++++++ - docs/.gitignore | 1 - - docs/Makefile | 89 ---------------- - docs/api.rst | 67 ------------ - docs/conf.py | 198 ----------------------------------- - docs/index.rst | 45 -------- - docs/ref/backup_schedules.rst | 60 ----------- - docs/ref/exceptions.rst | 14 --- - docs/ref/flavors.rst | 35 ------- - docs/ref/images.rst | 54 ---------- - docs/ref/index.rst | 12 --- - docs/ref/ipgroups.rst | 46 --------- - docs/ref/servers.rst | 73 ------------- - docs/releases.rst | 99 ------------------ - docs/shell.rst | 52 ---------- - setup.cfg | 6 +- - 30 files changed, 853 insertions(+), 849 deletions(-) - commit 93f9fa75fa8b96e4429dce73e0320686b5b52893 Author: John Griffith Date: Fri Jun 1 18:55:40 2012 -0600 @@ -1705,25 +1308,6 @@ Change-Id: Ie678f01a5008b0df6ef43a360b599890cab40776 - cinderclient/base.py | 4 +- - cinderclient/client.py | 28 +++--- - cinderclient/exceptions.py | 3 +- - cinderclient/service_catalog.py | 6 +- - cinderclient/shell.py | 172 +++++++++++++++++++----------------- - cinderclient/v1/client.py | 37 ++++---- - cinderclient/v1/shell.py | 76 ++++++++-------- - cinderclient/v1/volume_snapshots.py | 8 +- - cinderclient/v1/volumes.py | 22 ++--- - docs/conf.py | 2 +- - tests/fakes.py | 19 ++-- - tests/test_http.py | 3 +- - tests/test_service_catalog.py | 8 +- - tests/v1/fakes.py | 105 +++++++++++----------- - tests/v1/test_auth.py | 23 +++-- - tools/install_venv.py | 4 +- - tools/test-requires | 3 +- - 17 files changed, 269 insertions(+), 254 deletions(-) - commit 314fa34b75307c51a1eaf7c9eab9033b2cdc2d48 Author: Bhuvan Arumugam Date: Fri Jun 1 23:52:38 2012 -0700 @@ -1749,12 +1333,6 @@ Change-Id: I4e3c4524fc71a11f11b48fcb6abb99e6c7f33e90 - .gitignore | 1 + - AUTHORS | 0 - cinderclient/openstack/common/setup.py | 17 +++++++++++++++++ - cinderclient/shell.py | 2 +- - 4 files changed, 19 insertions(+), 1 deletion(-) - commit 1711f1f9bb3cd514ded6839cff7e3d3aff1df547 Author: Monty Taylor Date: Mon May 21 16:44:06 2012 -0400 @@ -1763,84 +1341,8 @@ Change-Id: Ic63c6fd4d770303ae5f295c58e43213e88e34b57 - AUTHORS | 60 ---------- - MANIFEST.in | 1 + - cinderclient/openstack/__init__.py | 0 - cinderclient/openstack/common/__init__.py | 0 - cinderclient/openstack/common/setup.py | 183 ++++++++++++++++++++++++++++++ - setup.cfg | 2 + - setup.py | 13 ++- - tools/pip-requires | 5 - - tools/test-requires | 10 ++ - tox.ini | 40 ++++++- - 10 files changed, 237 insertions(+), 77 deletions(-) - commit 471704df644eced17026c280b0aab9e549718e14 Author: Jenkins Date: Mon May 21 16:32:35 2012 -0400 - Initial split from python-novaclient. - - .gitignore | 11 + - .gitreview | 4 + - .mailmap | 15 + - AUTHORS | 60 +++ - HACKING | 115 ++++++ - LICENSE | 208 ++++++++++ - MANIFEST.in | 8 + - README.rst | 155 ++++++++ - cinderclient/__init__.py | 0 - cinderclient/base.py | 293 ++++++++++++++ - cinderclient/client.py | 330 ++++++++++++++++ - cinderclient/exceptions.py | 146 +++++++ - cinderclient/extension.py | 39 ++ - cinderclient/service_catalog.py | 77 ++++ - cinderclient/shell.py | 435 ++++++++++++++++++++ - cinderclient/utils.py | 261 ++++++++++++ - cinderclient/v1/__init__.py | 17 + - cinderclient/v1/client.py | 71 ++++ - cinderclient/v1/contrib/__init__.py | 0 - cinderclient/v1/shell.py | 241 ++++++++++++ - cinderclient/v1/volume_snapshots.py | 88 +++++ - cinderclient/v1/volume_types.py | 77 ++++ - cinderclient/v1/volumes.py | 135 +++++++ - docs/.gitignore | 1 + - docs/Makefile | 89 +++++ - docs/api.rst | 67 ++++ - docs/conf.py | 198 ++++++++++ - docs/index.rst | 45 +++ - docs/ref/backup_schedules.rst | 60 +++ - docs/ref/exceptions.rst | 14 + - docs/ref/flavors.rst | 35 ++ - docs/ref/images.rst | 54 +++ - docs/ref/index.rst | 12 + - docs/ref/ipgroups.rst | 46 +++ - docs/ref/servers.rst | 73 ++++ - docs/releases.rst | 99 +++++ - docs/shell.rst | 52 +++ - run_tests.sh | 154 ++++++++ - setup.cfg | 13 + - setup.py | 56 +++ - tests/__init__.py | 0 - tests/fakes.py | 71 ++++ - tests/test_base.py | 48 +++ - tests/test_client.py | 18 + - tests/test_http.py | 74 ++++ - tests/test_service_catalog.py | 127 ++++++ - tests/test_shell.py | 75 ++++ - tests/test_utils.py | 74 ++++ - tests/utils.py | 5 + - tests/v1/__init__.py | 0 - tests/v1/fakes.py | 765 ++++++++++++++++++++++++++++++++++++ - tests/v1/test_auth.py | 297 ++++++++++++++ - tests/v1/test_shell.py | 77 ++++ - tests/v1/testfile.txt | 1 + - tests/v1/utils.py | 29 ++ - tools/generate_authors.sh | 3 + - tools/install_venv.py | 244 ++++++++++++ - tools/nova.bash_completion | 15 + - tools/pip-requires | 9 + - tools/rfc.sh | 145 +++++++ - tools/with_venv.sh | 4 + - tox.ini | 14 + - 62 files changed, 5949 insertions(+) \ No newline at end of file + Initial split from python-novaclient. \ No newline at end of file diff -Nru python-cinderclient-1.0.3.11.ge7cfd77+git201304091131~raring/PKG-INFO python-cinderclient-1.0.3.12.gdca8dbd+git201304160401~raring/PKG-INFO --- python-cinderclient-1.0.3.11.ge7cfd77+git201304091131~raring/PKG-INFO 2013-04-09 15:34:14.000000000 +0000 +++ python-cinderclient-1.0.3.12.gdca8dbd+git201304160401~raring/PKG-INFO 2013-04-16 08:03:59.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: python-cinderclient -Version: 1.0.3.11.ge7cfd77 +Version: 1.0.3.12.gdca8dbd Summary: Client library for OpenStack Cinder API. Home-page: https://github.com/openstack/python-cinderclient Author: Rackspace, based on work by Jacob Kaplan-Moss diff -Nru python-cinderclient-1.0.3.11.ge7cfd77+git201304091131~raring/cinderclient/openstack/common/setup.py python-cinderclient-1.0.3.12.gdca8dbd+git201304160401~raring/cinderclient/openstack/common/setup.py --- python-cinderclient-1.0.3.11.ge7cfd77+git201304091131~raring/cinderclient/openstack/common/setup.py 2013-04-09 15:31:33.000000000 +0000 +++ python-cinderclient-1.0.3.12.gdca8dbd+git201304160401~raring/cinderclient/openstack/common/setup.py 2013-04-16 08:01:38.000000000 +0000 @@ -1,6 +1,6 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 -# Copyright 2011 OpenStack LLC. +# Copyright 2011 OpenStack Foundation. # Copyright 2012-2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # @@ -43,6 +43,11 @@ return mapping +def _parse_git_mailmap(git_dir, mailmap='.mailmap'): + mailmap = os.path.join(os.path.dirname(git_dir), mailmap) + return parse_mailmap(mailmap) + + def canonicalize_emails(changelog, mapping): """Takes in a string and an email alias mapping and replaces all instances of the aliases in the string with their real email. @@ -117,9 +122,9 @@ output = subprocess.Popen(["/bin/sh", "-c", cmd], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + out = output.communicate() if output.returncode and throw_on_error: raise Exception("%s returned %d" % cmd, output.returncode) - out = output.communicate() if len(out) == 0: return None if len(out[0].strip()) == 0: @@ -127,14 +132,26 @@ return out[0].strip() +def _get_git_directory(): + parent_dir = os.path.dirname(__file__) + while True: + git_dir = os.path.join(parent_dir, '.git') + if os.path.exists(git_dir): + return git_dir + parent_dir, child = os.path.split(parent_dir) + if not child: # reached to root dir + return None + + def write_git_changelog(): """Write a changelog based on the git changelog.""" new_changelog = 'ChangeLog' + git_dir = _get_git_directory() if not os.getenv('SKIP_WRITE_GIT_CHANGELOG'): - if os.path.isdir('.git'): - git_log_cmd = 'git log --stat' + if git_dir: + git_log_cmd = 'git --git-dir=%s log' % git_dir changelog = _run_shell_command(git_log_cmd) - mailmap = parse_mailmap() + mailmap = _parse_git_mailmap(git_dir) with open(new_changelog, "w") as changelog_file: changelog_file.write(canonicalize_emails(changelog, mailmap)) else: @@ -146,13 +163,23 @@ jenkins_email = 'jenkins@review.(openstack|stackforge).org' old_authors = 'AUTHORS.in' new_authors = 'AUTHORS' + git_dir = _get_git_directory() if not os.getenv('SKIP_GENERATE_AUTHORS'): - if os.path.isdir('.git'): + if git_dir: # don't include jenkins email address in AUTHORS file - git_log_cmd = ("git log --format='%aN <%aE>' | sort -u | " + git_log_cmd = ("git --git-dir=" + git_dir + + " log --format='%aN <%aE>' | sort -u | " "egrep -v '" + jenkins_email + "'") changelog = _run_shell_command(git_log_cmd) - mailmap = parse_mailmap() + signed_cmd = ("git --git-dir=" + git_dir + + " log | grep -i Co-authored-by: | sort -u") + signed_entries = _run_shell_command(signed_cmd) + if signed_entries: + new_entries = "\n".join( + [signed.split(":", 1)[1].strip() + for signed in signed_entries.split("\n") if signed]) + changelog = "\n".join((changelog, new_entries)) + mailmap = _parse_git_mailmap(git_dir) with open(new_authors, 'w') as new_authors_fh: new_authors_fh.write(canonicalize_emails(changelog, mailmap)) if os.path.exists(old_authors): @@ -258,43 +285,48 @@ return cmdclass -def _get_revno(): +def _get_revno(git_dir): """Return the number of commits since the most recent tag. We use git-describe to find this out, but if there are no tags then we fall back to counting commits since the beginning of time. """ - describe = _run_shell_command("git describe --always") + describe = _run_shell_command( + "git --git-dir=%s describe --always" % git_dir) if "-" in describe: return describe.rsplit("-", 2)[-2] # no tags found - revlist = _run_shell_command("git rev-list --abbrev-commit HEAD") + revlist = _run_shell_command( + "git --git-dir=%s rev-list --abbrev-commit HEAD" % git_dir) return len(revlist.splitlines()) -def get_version_from_git(pre_version): +def _get_version_from_git(pre_version): """Return a version which is equal to the tag that's on the current revision if there is one, or tag plus number of additional revisions if the current revision has no tag.""" - if os.path.isdir('.git'): + git_dir = _get_git_directory() + if git_dir: if pre_version: try: return _run_shell_command( - "git describe --exact-match", + "git --git-dir=" + git_dir + " describe --exact-match", throw_on_error=True).replace('-', '.') except Exception: - sha = _run_shell_command("git log -n1 --pretty=format:%h") - return "%s.a%s.g%s" % (pre_version, _get_revno(), sha) + sha = _run_shell_command( + "git --git-dir=" + git_dir + " log -n1 --pretty=format:%h") + return "%s.a%s.g%s" % (pre_version, _get_revno(git_dir), sha) else: return _run_shell_command( - "git describe --always").replace('-', '.') + "git --git-dir=" + git_dir + " describe --always").replace( + '-', '.') return None -def get_version_from_pkg_info(package_name): +def _get_version_from_pkg_info(package_name): """Get the version from PKG-INFO file if we can.""" try: pkg_info_file = open('PKG-INFO', 'r') @@ -325,10 +357,10 @@ version = os.environ.get("OSLO_PACKAGE_VERSION", None) if version: return version - version = get_version_from_pkg_info(package_name) + version = _get_version_from_pkg_info(package_name) if version: return version - version = get_version_from_git(pre_version) + version = _get_version_from_git(pre_version) if version: return version raise Exception("Versioning for this project requires either an sdist" diff -Nru python-cinderclient-1.0.3.11.ge7cfd77+git201304091131~raring/cinderclient/openstack/common/version.py python-cinderclient-1.0.3.12.gdca8dbd+git201304160401~raring/cinderclient/openstack/common/version.py --- python-cinderclient-1.0.3.11.ge7cfd77+git201304091131~raring/cinderclient/openstack/common/version.py 2013-04-09 15:31:33.000000000 +0000 +++ python-cinderclient-1.0.3.12.gdca8dbd+git201304160401~raring/cinderclient/openstack/common/version.py 2013-04-16 08:01:38.000000000 +0000 @@ -1,5 +1,5 @@ -# Copyright 2012 OpenStack LLC +# Copyright 2012 OpenStack Foundation # Copyright 2012-2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -33,6 +33,14 @@ self.version = None self._cached_version = None + def __str__(self): + """Make the VersionInfo object behave like a string.""" + return self.version_string() + + def __repr__(self): + """Include the name.""" + return "VersionInfo(%s:%s)" % (self.package, self.version_string()) + def _get_version_from_pkg_resources(self): """Get the version of the package from the pkg_resources record associated with the package.""" @@ -41,11 +49,11 @@ provider = pkg_resources.get_provider(requirement) return provider.version except pkg_resources.DistributionNotFound: - # The most likely cause for this is running tests in a tree with + # The most likely cause for this is running tests in a tree # produced from a tarball where the package itself has not been - # installed into anything. Check for a PKG-INFO file. + # installed into anything. Revert to setup-time logic. from cinderclient.openstack.common import setup - return setup.get_version_from_pkg_info(self.package) + return setup.get_version(self.package) def release_string(self): """Return the full version of the package including suffixes indicating diff -Nru python-cinderclient-1.0.3.11.ge7cfd77+git201304091131~raring/debian/changelog python-cinderclient-1.0.3.12.gdca8dbd+git201304160401~raring/debian/changelog --- python-cinderclient-1.0.3.11.ge7cfd77+git201304091131~raring/debian/changelog 2013-04-09 15:34:18.000000000 +0000 +++ python-cinderclient-1.0.3.12.gdca8dbd+git201304160401~raring/debian/changelog 2013-04-16 08:04:03.000000000 +0000 @@ -1,12 +1,14 @@ -python-cinderclient (1:1.0.3.11.ge7cfd77+git201304091131~raring-0ubuntu1) raring; urgency=low +python-cinderclient (1:1.0.3.12.gdca8dbd+git201304160401~raring-0ubuntu1) raring; urgency=low * Automated Ubuntu testing build: - * [fd3351f] Minor typo/message fixes + * [dca8dbd] Sync with oslo-incubator copy of setup.py and version.py + * [5e4a985] Remove unused "import sys" * [130963e] Fix result -> resp typo in unset_keys * [952970a] Fix X-Auth_Token -> X-Auth-Token header name + * [c83e4a4] Pin prettytable versions * [f80509f] Add OS_TENANT_ID as authentication option - -- Openstack Ubuntu Testing Bot Tue, 09 Apr 2013 11:34:15 -0400 + -- Openstack Ubuntu Testing Bot Tue, 16 Apr 2013 04:03:59 -0400 python-cinderclient (1:1.0.3-0ubuntu1) raring; urgency=low diff -Nru python-cinderclient-1.0.3.11.ge7cfd77+git201304091131~raring/python_cinderclient.egg-info/PKG-INFO python-cinderclient-1.0.3.12.gdca8dbd+git201304160401~raring/python_cinderclient.egg-info/PKG-INFO --- python-cinderclient-1.0.3.11.ge7cfd77+git201304091131~raring/python_cinderclient.egg-info/PKG-INFO 2013-04-09 15:34:14.000000000 +0000 +++ python-cinderclient-1.0.3.12.gdca8dbd+git201304160401~raring/python_cinderclient.egg-info/PKG-INFO 2013-04-16 08:03:58.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: python-cinderclient -Version: 1.0.3.11.ge7cfd77 +Version: 1.0.3.12.gdca8dbd Summary: Client library for OpenStack Cinder API. Home-page: https://github.com/openstack/python-cinderclient Author: Rackspace, based on work by Jacob Kaplan-Moss