commit 5c0c72051fd0a32c51bb68d955169b07d36ec882
Merge: 5edbbd3 7b45807
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 6 22:49:39 2012 +0000

    Merge "Remove dependencies for netaddr."

commit 5edbbd3f34256d60a3f39f129253680ec01cc159
Merge: d16b820 d6a5d0f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 6 22:49:07 2012 +0000

    Merge "Fix Typo in LOG.error"

commit d16b820dd51344d5b96b095102fd5d465f69a489
Merge: 01b1a9e 0903603
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 6 22:47:05 2012 +0000

    Merge "Specify the conf file when creating a volume."

commit 01b1a9e1795ecccccbdc66bf9068ccb4f544d5fe
Merge: 5d72e7a 51a008d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 6 22:30:57 2012 +0000

    Merge "Fix xml metadata for volumes api in cinder."

commit 0903603971033536751ba40df98a3c39175d3189
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Sep 6 14:50:50 2012 -0400

    Specify the conf file when creating a volume.
    
    Updates the tgt-admin command to actually use the config file
    we create for the volume being created.
    
    This fixes an issue introduced in
    9785963c841aff5ea1c159da81f93c2bf62c70c6 which breaks iscsi
    volume creation.
    
    Fixes LP Bug #1046985.
    
    Change-Id: I06e83c9ba351c2b4846b557a3abb170a51d506c0

 cinder/tests/test_iscsi.py |    2 +-
 cinder/volume/iscsi.py     |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 5d72e7a40e49e6d69e6733b2564dcfc08f398bd1
Merge: 802c05b c191d0d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 6 19:24:57 2012 +0000

    Merge "Add admin actions extension"

commit d6a5d0f9faa43a82104a0ed936382195b89d4107
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Sep 6 09:50:37 2012 -0500

    Fix Typo in LOG.error
    
    Fix typo in LOG.error, it should be
    vol_id rather than volume_id.
    Fixes bug #1046875
    
    Change-Id: Id162c6f185a110b63e8f9f509f5cde75f3626cbf
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 cinder/volume/iscsi.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7b458073cefac296f41c11ffacb0f18785f127d8
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Sep 3 22:11:59 2012 -0400

    Remove dependencies for netaddr.
    
    Updates cinder utils.py to remove the parse_server_string and
    is_valid_cidr functions. These functions aren't in use
    and are the only reason we need the netaddr dependency.
    
    Updates pip-requires to drop the netaddr dependency.
    
    Also removes the unit tests for removed functions.
    Change-Id: I521ae60b758324069fb1ffa1701b1f9deb780f65

 cinder/tests/test_utils.py |   23 ------------------
 cinder/utils.py            |   55 --------------------------------------------
 tools/pip-requires         |    1 -
 3 files changed, 79 deletions(-)

commit 802c05b86a927787d480d16798a62794613695b5
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Sep 5 13:13:08 2012 -0400

    Regenerate cinder.conf.sample.
    
    Create a new version of cinder.conf.sample using
    tools/conf/generate_sample.sh.
    
    Old version had 475 options.
    
    New version has 133 options (more accurate).
    
    Change-Id: Id60aec1d91179a294e1969b7ab1f54051cb7a728

 etc/cinder/cinder.conf.sample | 1012 ++++++++++++++++++-----------------------
 1 file changed, 443 insertions(+), 569 deletions(-)

commit 0094303e36cf1c01db539a1eea7771ebcb4d336a
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Sep 5 12:59:28 2012 -0400

    Sync improvements to config file generator tools.
    
    We made some improvements to the config file generator in
    Nova during Folsom including spacing and formatting changes.
    
    This patch merges these into Cinder so we can make use of
    them to generate a new sample config file.
    
    Change-Id: I1e1166ac6e2a28cc179223e5af547995f58b36e6

 tools/conf/create_conf.py     |  159 ----------------------------------
 tools/conf/extract_opts.py    |  188 +++++++++++++++++++++++++++++++++++++++++
 tools/conf/generate_sample.sh |   11 ++-
 3 files changed, 193 insertions(+), 165 deletions(-)

commit b7745f5e8d871b6ce4a140eb9705b6ec39754159
Merge: 700583d 8c30edf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 5 17:19:01 2012 +0000

    Merge "Removed unnecessary call to ensure_export"

commit 700583d26220cd3e792c1af33c60b8c1ba3c0769
Merge: 5586119 ffe5036
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 4 17:59:05 2012 +0000

    Merge "Fix bug where image size is incorrectly rejected."

commit 5586119f4a838b12a46bd12b316c9944efa6691a
Merge: bdba7e3 b84d623
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 4 17:56:21 2012 +0000

    Merge "Make size optional when creating a volume from a snap"

commit 51a008dfdbb80c158d85beed4e310f94b068d341
Author: Matthew Treinish <treinish@linux.vnet.ibm.com>
Date:   Tue Sep 4 11:08:16 2012 -0400

    Fix xml metadata for volumes api in cinder.
    
    Fixes bug 1040891.
    
    Change-Id: Idf8cc641162617ade2aeb77b666270cf1ce54c54
    Signed-off-by: Matthew Treinish <treinish@linux.vnet.ibm.com>

 cinder/api/openstack/common.py                    |   74 +++++++++++
 cinder/api/openstack/volume/volumes.py            |   53 +++++++-
 cinder/api/openstack/wsgi.py                      |   12 ++
 cinder/tests/api/openstack/volume/test_volumes.py |  136 ++++++++++++++++++++-
 4 files changed, 266 insertions(+), 9 deletions(-)

commit ffe5036fa0e63ccde2d19aa0f425ec43de338dd7
Author: Dermot Tynan <tynan@hp.com>
Date:   Thu Aug 30 17:38:22 2012 +0000

    Fix bug where image size is incorrectly rejected.
    
    Fixes bug 1043952.
    
    Added GB-1 (one byte less than a gig) to the numerator to
    correct round-off errors.
    
    Change-Id: I6d97f3c53ab5a8ff5a0752400fd189f23223958f
    
    Fixed PEP8 complaints.
    
    Change-Id: Iacecddd4e65c80964f4860d6580872d897ec2356

 cinder/tests/test_volume.py |   43 +++++++++++++++++++++++++++++++++++++++++++
 cinder/volume/api.py        |    2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)

commit bdba7e3bbf7cef4417309eb356aea4b805d3c974
Merge: 56405da b60c390
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 4 03:24:45 2012 +0000

    Merge "Several hacking compliance fixes."

commit b60c3909cec2e96e09c664bf7caca4b7b3b6ba54
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Sep 3 22:17:06 2012 -0400

    Several hacking compliance fixes.
    
    Updates bin/nova-manage and the solidfire driver with several
    hacking compliance fixes.
    
    Makes it so run_tests.sh -p runs clean again.
    
    Change-Id: Iee675cae06acda6a585a77073e773651aab9d5a1

 bin/cinder-manage          |    6 +++---
 cinder/volume/solidfire.py |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 56405da849bc76dc97e3e1bcbfda00d3b73a57cd
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Sep 3 22:02:22 2012 -0400

    Remove Cheetah from pip-requires.
    
    We don't use Cheetah so no need to install it w/ pip.
    
    Change-Id: I29ea1b0ec2bf2eaebe4378c15c3cfc0caebabf99

 tools/pip-requires |    1 -
 1 file changed, 1 deletion(-)

commit bedc8b6622bc711acc86e7ef245be478c1e4a2b4
Author: RongzeZhu <zrzhit@gmail.com>
Date:   Mon Sep 3 12:26:35 2012 +0800

    Typo fix: nova => cinder
    
    Change-Id: I816473b3aa7de16bd2d8569c695c6ced9e1d9033

 cinder/volume/xiv.py                 |    2 +-
 etc/cinder/rootwrap.d/volume.filters |   22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

commit c58e87cfe19adbd432b23cfea00ce72e8636403b
Author: Ben Swartzlander <bswartz@netapp.com>
Date:   Wed Aug 29 20:35:33 2012 -0400

    Move newly created NFS exceptions to standard location in exception.py
    Addresses bug 1037619
    
    bug 1037619
    
    Change-Id: I20b1c612c03ef90eeb074814b979a9bc7492109c

 cinder/exception.py      |   12 ++++++++++++
 cinder/tests/test_nfs.py |    9 +++++----
 cinder/volume/nfs.py     |   23 +++++------------------
 3 files changed, 22 insertions(+), 22 deletions(-)

commit 99e8882f5ff777ce19ea25b923416bbb4511dd63
Merge: fe70a0e 91311d5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 1 00:57:54 2012 +0000

    Merge "Remove unused flags"

commit c191d0d10c6cb5730a4fb6540198ca3be6595b02
Author: Clay Gerrard <clay.gerrard@gmail.com>
Date:   Mon Aug 27 07:48:32 2012 +0000

    Add admin actions extension
    
    The optional os-admin-actions extension adds new wsgi_actions to the
    volumes/action resource and a new snapshots/action endpoint.
    
    With this extension both controllers will support an os-reset_status
    action to force a database update of a volume or snapshot that is stuck
    in a failed/incorrect status.  The os-reset_status action works
    similarly to the compute api's os-reset_state action for instances.
    
    The os-force_delete action behaves similarly to the "cinder-manage
    volume delete" command and allows operators/admins to retry the delete
    operation after it has gone into an error_deleting status with an admin
    api call.
    
    The os-admin-actions extension is enabled by default, but limited to the
    admin api by the default policy.json rules.  Individual admin actions
    can be disabled with policy rules as well.
    
    Example of os-reset_status action on a volume:
    
    curl http://localhost:8776/v1/${PROJECT_ID}/volumes/${VOLUME_ID}/action \
        -H 'x-auth-token: ${ADMIN_AUTH_TOKEN}' \
        -H 'content-type: application/json' \
        -d '{"os-reset_status": {"status": "error"}}'
    
    The new admin only api can assist deployers who encounter bugs or
    operational issues that result in failed actions.
    
    It can also be used by future storage backends to support async callback
    style status updates from long running actions or operations which have
    encountered an error will be retried.
    
    Also updates the api.openstack.wsgi.ControllerMetaclass to support
    sub-classing wsgi.Controllers that define wsgi_actions.
    
    Partial fix for bug #1039706
    
    Change-Id: I29f4b892a99108b6c24eebc3eb58033a9e01e679

 cinder/api/openstack/extensions.py                 |    5 +-
 cinder/api/openstack/volume/__init__.py            |    5 +-
 .../api/openstack/volume/contrib/admin_actions.py  |  129 ++++++++++++++
 cinder/api/openstack/volume/snapshots.py           |    7 +-
 cinder/api/openstack/wsgi.py                       |    3 +
 .../openstack/volume/contrib/test_admin_actions.py |  176 ++++++++++++++++++++
 cinder/tests/api/openstack/volume/test_router.py   |    8 +-
 cinder/tests/policy.json                           |    5 +
 cinder/tests/test_volume.py                        |   47 +++++-
 cinder/volume/api.py                               |    4 +-
 etc/cinder/policy.json                             |    5 +-
 11 files changed, 377 insertions(+), 17 deletions(-)

commit fe70a0ebc47843a08d085e7ab4104898c069f427
Merge: 48ce2b7 5da61a7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 31 16:41:24 2012 +0000

    Merge "Use event.listen() instead of deprecated listeners kwarg"

commit 48ce2b79a1d393de14c825e5722b5a7710eb36aa
Merge: f5f1824 a3af3f8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 31 16:12:07 2012 +0000

    Merge "Implement volume quota support in Cinder"

commit f5f1824a4ba9a3e5fa29d955961b988168b22207
Merge: aab103b 9785963
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 31 15:23:45 2012 +0000

    Merge "Fix creation of iscsi targets"

commit aab103bd25db6444a94a834224da662080f3105f
Merge: 7f4cc61 560b650
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 31 15:22:33 2012 +0000

    Merge "Add cinder- prefix to all binaries."

commit 7f4cc61ceb026505654098bd630ea63a12001587
Merge: cabb54c 4aebd52
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 31 15:06:31 2012 +0000

    Merge "Make glance image service check base exception classes"

commit 8c30edff982042d2533a810709308b586267c0e9
Author: Unmesh Gurjar <unmesh.gurjar@vertex.co.in>
Date:   Fri Aug 31 07:25:39 2012 -0700

    Removed unnecessary call to ensure_export
    
    Removed the extra call to 'ensure_export' from '_copy_image_to_volume' while
    creating a volume from an image.
    
    Fixes LP: #1044399
    
    Change-Id: I189a4cb66b965367289c2f677147ee085e431190

 cinder/volume/manager.py |    1 -
 1 file changed, 1 deletion(-)

commit 560b650fa83ff3ce274a705c321fb940c7499a75
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Aug 31 09:56:50 2012 -0400

    Add cinder- prefix to all binaries.
    
    Renames clear_rabbit_queues and volume-usuage-audit binaries
    so that they are prefixed with 'cinder-'.
    
    As part of this change the clear_rabbit_queues binary was changed
    to use dashes instead of underscores for consistency with the rest
    of the cinder binaries.
    
    Fixes LP Bug #1044386.
    
    Change-Id: I7692a543cc67af2d342a64b84626de38c0a64f81

 bin/cinder-clear-rabbit-queues |   77 +++++++++++++++++++++++++++++++++++
 bin/cinder-volume-usage-audit  |   87 ++++++++++++++++++++++++++++++++++++++++
 bin/clear_rabbit_queues        |   77 -----------------------------------
 bin/volume-usage-audit         |   87 ----------------------------------------
 setup.py                       |    8 ++--
 5 files changed, 168 insertions(+), 168 deletions(-)

commit b84d6237729efb9241d934e2d06d77bf9adb8471
Author: Duncan Thomas <duncan.thomas@gmail.com>
Date:   Fri Aug 17 10:15:52 2012 +0000

    Make size optional when creating a volume from a snap
    
    Changing the size of a volume when cloning a snapshot doesn't
    make a great deal of sense *and isn't part of the ec2 api).
    
    This patch makes the field optional, defaulting to the same
    size as the snapshot (and therefore the origination volume).
    
    Change-Id: I3fea7fe1c0415d10e549c66a242cf2a336a7204e

 cinder/api/openstack/volume/volumes.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 9785963c841aff5ea1c159da81f93c2bf62c70c6
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Aug 28 15:06:25 2012 -0500

    Fix creation of iscsi targets
    
    Previously when creating iscsi volumes, we were using
    
    tgt-admin -e -c <config file> --update volume-id
    
    Unfortunately the side affect of this is that tgt-admin
    removed other volumes that weren't connected to an iscsi
    connector. Which is obvlously not what we want.
    
    In order to fix this we create the targets.conf for the
    volume but we call tgt-admin --update icssi qualified name.
    
    We're dropping the use of iscsi_targets table when using TgtAdm.
    Compatability for other target admin types is maintained.
    
    Fixes LP: #1038062
    
    Change-Id: I9060a43208df5b79e9b17dadcab8bc0a8eeef55e
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 cinder/exception.py         |   15 ++++--
 cinder/tests/test_iscsi.py  |   23 ++++----
 cinder/tests/test_volume.py |   67 ++++-------------------
 cinder/volume/driver.py     |  123 ++++++++++++++++++++++++++++++-------------
 cinder/volume/iscsi.py      |  122 ++++++++++++++++++++++++++----------------
 5 files changed, 199 insertions(+), 151 deletions(-)

commit cabb54c5806022e696697e7c1fa6c81b482d2b20
Author: Joe Gordon <jogo@cloudscaling.com>
Date:   Thu Aug 30 13:35:07 2012 -0700

    Spelling: Persistant=>Persistent
    
    Change-Id: Id8e1bef634fe66e06624b5b3bcd82f59735d76e3

 cinder/volume/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a3af3f87f5ca95e9b400dc15e7593746d01bc43a
Author: John Griffith <john.griffith@solidfire.com>
Date:   Thu Aug 16 15:52:52 2012 -0600

    Implement volume quota support in Cinder
    
    parital fix for bug 1023311
      * To use needs cinderclient https://review.openstack.org/#/c/11509/
      * Updates quota classes with changes in Nova
      * Adds needed quota related DB tables
      * Updates test_quota to reflect changes in Nova
      * Adds absolute limits and empty rate limit functions
      * Updates test/integration/test_volume to make it work w/ above changes
    
    Change-Id: I221c7a9dc51a2bb9bf7228c056f63ba9546cf5f9

 cinder/api/openstack/volume/__init__.py            |    5 +
 .../api/openstack/volume/contrib/quota_classes.py  |  105 ++
 cinder/api/openstack/volume/contrib/quotas.py      |  125 ++
 cinder/api/openstack/volume/limits.py              |  482 ++++++
 .../api/openstack/volume/schemas/v1.1/limits.rng   |   28 +
 cinder/api/openstack/volume/views/limits.py        |  100 ++
 cinder/api/openstack/wsgi.py                       |   60 +-
 cinder/db/api.py                                   |    6 +-
 cinder/db/sqlalchemy/api.py                        |  519 ++++++-
 .../migrate_repo/versions/002_quota_class.py       |  140 ++
 cinder/db/sqlalchemy/models.py                     |   37 +-
 cinder/exception.py                                |   37 +
 cinder/quota.py                                    |  911 +++++++++---
 cinder/tests/api/openstack/fakes.py                |    1 +
 cinder/tests/api/openstack/volume/test_limits.py   |  896 ++++++++++++
 cinder/tests/integrated/test_volumes.py            |    2 +-
 cinder/tests/test_quota.py                         | 1527 +++++++++++++++++---
 cinder/tests/test_volume.py                        |   43 +-
 cinder/volume/api.py                               |   44 +-
 etc/cinder/policy.json                             |    8 +-
 20 files changed, 4617 insertions(+), 459 deletions(-)

commit a55430ce286b291e5a5611b1e908b325ab3de20d
Merge: 6db3732 3ed4d0b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 30 17:02:44 2012 +0000

    Merge "Fix PEP8 issues."

commit 6db37323239a4fa455c0708a15f082af5c68d096
Merge: cc25287 5475deb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 30 17:01:50 2012 +0000

    Merge "Add 'detaching' to volume status"

commit cc252878f2c778cb63d383479b9dce63ca2d98c7
Merge: c13d0d2 198a91a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 30 17:01:28 2012 +0000

    Merge "Remove unused return values and commented out code from NFS driver"

commit c13d0d2d19549cdd3f26eae43e6dca026fa55f7d
Merge: 4533e5b 938d92e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 30 15:43:42 2012 +0000

    Merge "Remove unused exceptions from cinder/exception.py"

commit 198a91a5e447915beca9585546cb92ab956fb0e6
Author: Ben Swartzlander <bswartz@netapp.com>
Date:   Wed Aug 29 19:10:11 2012 -0400

    Remove unused return values and commented out code from NFS driver
    
    bug 1037622
    
    Change-Id: Idea3005ad94fd6bfc76fd0f3969ee78e3031767e

 cinder/volume/nfs.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit 91311d5c2c89aca666bb40dc04d917eea9266ed1
Author: Rongze Zhu <zrzhit@gmail.com>
Date:   Wed Aug 29 09:46:32 2012 +0000

    Remove unused flags
    
    * region_list
    * aws_access_key_id
    * aws_secret_access_key
    * osapi_scheme
    * osapi_path
    * metadata_host
    * metadata_port
    * default_project
    * default_image
    * default_instance_type
    * vpn_image_id
    * vpn_key_suffix
    * auth_token_ttl
    * bandwith_poll_interval
    * start_guests_on_host_boot
    * resume_guests_state_on_host_boot
    * default_ephemeral_format
    * use_ipv6
    * allow_resize_to_same_host
    * zombie_instance_updated_at_window
    * isolated_images
    * isolated_hosts
    
    Change-Id: Ia3d5ac7d7c983845b5411e2fc1f49eb579e3280f

 cinder/flags.py               |   70 -----------------------------------------
 etc/cinder/cinder.conf.sample |   44 --------------------------
 2 files changed, 114 deletions(-)

commit 3ed4d0b62838d53fedea5280523fdaaec76381bb
Author: lrqrun <lrqrun@gmail.com>
Date:   Tue Aug 28 23:28:48 2012 +0800

    Fix PEP8 issues.
    
    Fix some pep8 issues in doc/ext/cinder_todo.py make the code looks pretty.
    
    Change-Id: I137c8bf5af30eb54a44cbff7f1fbc35bc2c3ed9e

 doc/ext/cinder_todo.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 4533e5b4509643768c070f6b5a672f1d6a62e27b
Merge: eb9a58d ca25ea4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 27 16:04:14 2012 +0000

    Merge "Migrate volume related quota info in db migration"

commit eb9a58d3eaa10a8a661baf0c1ed534aeb0877dcf
Merge: 56b2e78 f80f8df
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Aug 25 17:57:27 2012 +0000

    Merge "Fix PEP8 issues."

commit 56b2e78a12bb3c61a64ea24420e1a94aa7fd4dea
Merge: 5b34c99 8b92df9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Aug 25 17:49:37 2012 +0000

    Merge "Typo fix in cinder: existant => existent"

commit 5b34c99c734a5749ef03879745226dc5831f6642
Merge: 53de0dd 3034247
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Aug 25 17:49:02 2012 +0000

    Merge "Fix incorrect tgt-admin call in create_iscsi_target"

commit 3034247a4ec7c9c6e433cad6d13183b001fe2e6d
Author: John Griffith <john.griffith@solidfire.com>
Date:   Thu Aug 23 13:23:04 2012 -0600

    Fix incorrect tgt-admin call in create_iscsi_target
    
      * Fixes bug 1039826
      * Missed one of the execute cmds that was using 'val %s' as args
    
    Change-Id: I5e6af737ada1c2bcf7a495710e2b10c8c74bb534

 cinder/volume/iscsi.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 5475debcf706e87b1df926d489b72074662614f3
Author: Rongze Zhu <zrzhit@gmail.com>
Date:   Tue Aug 21 15:07:02 2012 +0000

    Add 'detaching' to volume status
    
    Fixes bug #1004382
    
    When attach a volume , the volume status is "available -> attaching ->
    in-use", But when detaching a volume , the volume status is "in-use ->
    available". So We need 'detaching' volume status, it make the change of
    state of the volume more clearly.
    
    Change-Id: Idf8c38413135bf8e8cd025f11937f8c7250557c1

 .../api/openstack/volume/contrib/volume_actions.py |   16 ++++++++++++++++
 cinder/tests/policy.json                           |    2 ++
 cinder/tests/test_volume.py                        |   11 +++++++++++
 cinder/volume/api.py                               |    9 +++++++++
 4 files changed, 38 insertions(+)

commit 8b92df9febce5bc45fa57bb347779b9644a38c44
Author: Rongze Zhu <zrzhit@gmail.com>
Date:   Thu Aug 23 03:00:08 2012 +0000

    Typo fix in cinder: existant => existent
    
    Impact:
    * locale message in cinder/locale/*/LC_MESSAGES/nova.po
    * locale message in cinder/locale/nova.po
    * Test function names
    * Test strings and comments
    
    Change-Id: I623af176d3b556a1ea9f8bde2c609fc4f752d7da

 cinder/locale/bs/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/cs/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/da/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/de/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/en_AU/LC_MESSAGES/nova.po |    2 +-
 cinder/locale/en_GB/LC_MESSAGES/nova.po |    2 +-
 cinder/locale/es/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/fr/LC_MESSAGES/nova.po    |    4 ++--
 cinder/locale/it/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/ja/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/ko/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/nova.pot                  |    2 +-
 cinder/locale/pt_BR/LC_MESSAGES/nova.po |    2 +-
 cinder/locale/ru/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/tl/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/tr/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/uk/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/zh_CN/LC_MESSAGES/nova.po |    2 +-
 cinder/locale/zh_TW/LC_MESSAGES/nova.po |    2 +-
 cinder/tests/test_nova_rootwrap.py      |    4 ++--
 cinder/tests/test_volume_types.py       |    2 +-
 cinder/tests/test_wsgi.py               |    2 +-
 22 files changed, 24 insertions(+), 24 deletions(-)

commit 4aebd529f979ed51f46c27b20ed5fe34e48757f7
Author: John Griffith <john.griffith@solidfire.com>
Date:   Wed Aug 22 16:26:15 2012 -0600

    Make glance image service check base exception classes
    
    Fixes bug 1039675
    
    glanceclient can raise HTTPNotFound (as well as NotFound) it appears,
    but glance image service is only converting NotFound ->
    InstanceNotFound.  Same applies to 'Forbidden' and other exceptions.
    
    This patch converts 'exc_type is NotFound'-like checks to use
    'isinstance' instead, which will cover HTTPNotFound, etc.
    
    Also add missing glance/image tests that weren't in Cinder
    
    Change-Id: I8787598daccf401a26d9397946ecd55f89ff62b3

 cinder/image/glance.py            |   24 +-
 cinder/tests/glance/__init__.py   |   20 ++
 cinder/tests/glance/stubs.py      |  112 ++++++++
 cinder/tests/image/test_glance.py |  546 +++++++++++++++++++++++++++++++++++++
 4 files changed, 690 insertions(+), 12 deletions(-)

commit f80f8dfecb280673e9661447a9555bac0959e827
Author: Ray Chen <oldsharp@163.com>
Date:   Wed Aug 22 11:57:42 2012 +0800

    Fix PEP8 issues.
    
    Fix some pep8 issues in doc/ext/cinder_todo.py and
    doc/source/conf.py and make the code looks pretty.
    
    Change-Id: Ie164bc7328507e20b0ab5993ba97eaadbd74bf63

 doc/ext/cinder_todo.py |   15 +++++++------
 doc/source/conf.py     |   56 +++++++++++++++++++++++++++++-------------------
 2 files changed, 42 insertions(+), 29 deletions(-)

commit 938d92e8a9a2ee97fb7951ed232b58d614a27adf
Author: RongzeZhu <zrzhit@gmail.com>
Date:   Wed Aug 22 11:37:26 2012 +0800

    Remove unused exceptions from cinder/exception.py
    
    find cinder/ -type f -name "*pyc" -exec rm {} \;
    exceptions=`cat cinder/exception.py| grep -E '^class' |\
     awk {'print $2'} | awk -F '(' {'print $1'}`
    for exc in $exceptions
    do
        i=`find cinder/ -type f -exec grep -R $exc {} \; |wc -l`
        if [ $i -eq 1 ]
        then
            echo $exc
        fi
    done
    
    First removed exceptions:
    
    DecryptionFailure
    ImagePaginationFailed
    VirtualInterfaceCreateException
    VirtualInterfaceMacAddressException
    MelangeConnectionFailed
    VolumeUnattached
    InvalidKeypair
    InvalidSignature
    InvalidInstanceType
    InvalidIpProtocol
    InvalidCidr
    InvalidAggregateAction
    InvalidGroup
    InstanceInvalidState
    InstanceNotRunning
    InstanceNotSuspended
    InstanceNotInRescueMode
    InstanceSuspendFailure
    InstanceResumeFailure
    InstanceRebootFailure
    InstanceTerminationFailure
    VolumeServiceUnavailable
    UnableToMigrateToSelf
    DestinationHostUnavailable
    SourceHostUnavailable
    InvalidHypervisorType
    DestinationHypervisorTooOld
    DestinationDiskExists
    InvalidDevicePath
    DeviceIsBusy
    InvalidCPUInfo
    InvalidIpAddressError
    InvalidVLANTag
    InvalidVLANPortGroup
    InvalidDiskFormat
    InstanceUnacceptable
    FlagNotSet
    NoVolumeTypesFound
    VolumeDriverNotFound
    ListingImageRefsNotSupported
    KernelNotFoundForImage
    ProjectNotFound
    ProjectMembershipNotFound
    UserRoleNotFound
    StorageRepositoryNotFound
    DatastoreNotFound
    FixedIpNotFoundForAddress
    FixedIpNotFoundForInstance
    FixedIpNotFoundForNetworkHost
    FixedIpNotFoundForSpecificInstance
    FixedIpNotFoundForHost
    FixedIpAlreadyInUse
    FixedIpInvalid
    NoMoreFixedIps
    NoFixedIpsDefined
    FloatingIpDNSExists
    FloatingIpNotFoundForAddress
    FloatingIpNotFoundForHost
    NoMoreFloatingIps
    FloatingIpAssociated
    FloatingIpNotAssociated
    NoFloatingIpsDefined
    NoFloatingIpInterface
    KeypairNotFound
    CertificateNotFound
    AuthTokenNotFound
    AccessKeyNotFound
    SecurityGroupNotFoundForProject
    SecurityGroupNotFoundForRule
    SecurityGroupExistsForInstance
    SecurityGroupNotExistsForInstance
    NoInstanceTypesFound
    InstanceTypeNotFoundByName
    FlavorNotFound
    CellNotFound
    SchedulerHostFilterNotFound
    SchedulerCostFunctionNotFound
    SchedulerWeightFlagNotFound
    InstanceMetadataNotFound
    InstanceTypeExtraSpecsNotFound
    LDAPUserNotFound
    LDAPGroupNotFound
    LDAPGroupMembershipNotFound
    NoFilesFound
    SwitchNotFoundForNetworkAdapter
    NetworkAdapterNotFound
    GlobalRoleNotAllowed
    ImageRotationNotAllowed
    RotationRequiredForBackup
    LDAPUserExists
    LDAPGroupExists
    LDAPMembershipExists
    ProjectExists
    InstanceExists
    InstanceTypeExists
    InvalidSharedStorage
    CannotResizeToSameSize
    ImageTooLarge
    ZoneRequestError
    InstanceTypeMemoryTooSmall
    InstanceTypeDiskTooSmall
    InsufficientFreeMemory
    CouldNotFetchMetrics
    AggregateError
    AggregateNotFound
    AggregateNameExists
    AggregateHostNotFound
    AggregateMetadataNotFound
    AggregateHostConflict
    AggregateHostExists
    InstanceTypeCreateFailed
    SolidFireAPIStatusException
    DuplicateVlan
    InvalidInstanceIDMalformed
    CouldNotFetchImage
    
    Search again, Second removed exceptions:
    
    UserNotFound
    FixedIpNotFoundForNetwork
    FloatingIpNotFound
    SecurityGroupNotFound
    InstanceTypeNotFound
    LDAPObjectNotFound
    UserExists
    
    Search again, Third removed exceptions:
    
    FixedIpNotFound
    
    Change-Id: I028122c6132340b2fef2c144da787b7c4efddccf

 cinder/exception.py |  517 ---------------------------------------------------
 1 file changed, 517 deletions(-)

commit 53de0dd77ead04422e05a6251cb92c46d787aae6
Author: Clark Boylan <clark.boylan@gmail.com>
Date:   Tue Aug 21 14:08:57 2012 -0700

    Add nosehtmloutput as a test dependency.
    
    Adding nosehtmloutput as a test dependency allows nose to output its
    results to an html file. This will be used by Jenkins to save logs
    on a different server.
    
    Change-Id: I03f61fe4a8f0daa4a43fc9e7d41456b65018cf66

 tools/test-requires |    1 +
 1 file changed, 1 insertion(+)

commit ca25ea47782be90f65e9e5311de295499de19f2b
Author: John Griffith <john.griffith@solidfire.com>
Date:   Tue Aug 21 14:00:18 2012 -0600

    Migrate volume related quota info in db migration
    
      * Fixes bug 1039615
      * Now that quotas are back we need to handle migration
        of volume related quota data in the cinder-manage migrate helper
      * Only resource types transferred are volumes and gigabytes
    
    Change-Id: Idd9aab834612e929683491f47fa1e1861bdbd0d1

 bin/cinder-manage |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit 4e81c907bbb9d94d4b76b00ff591418374175d41
Merge: d2db1e9 bace7fb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 21 00:19:27 2012 +0000

    Merge "Add declare for xiv driver in fake_flags"

commit d2db1e9c40cb13ac513184a6435b2eb581305a46
Merge: d0c6448 e958531
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 20 17:12:40 2012 +0000

    Merge "Remove logging in volume tests"

commit 5da61a7ad9d7c3320831c437c03c428b9df84ebb
Author: unicell <unicell@gmail.com>
Date:   Mon Aug 20 19:34:19 2012 +0800

    Use event.listen() instead of deprecated listeners kwarg
    
    Fixes bug 1031405
    
    The listeners kwarg is deprecated in SQLAlchemy 0.7.0. Since 0.7.3 is
    the minimum required version of SQLAlchemy, use the new event.listen()
    API instead.
    
    Change-Id: I1b851e197c04b131ae96e814780b04e6dcdeeb1a

 cinder/db/sqlalchemy/session.py |   39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

commit bace7fb1b6596c44c500468f689b9b1ef4ad5222
Author: John Griffith <john.griffith@solidfire.com>
Date:   Fri Aug 17 11:27:21 2012 -0600

    Add declare for xiv driver in fake_flags
    
      fixes bug 1038183
    
    Change-Id: I324a8e4df61782c903146cc8e0bb1d1bbae46c2f

 cinder/tests/fake_flags.py |    1 +
 cinder/tests/test_xiv.py   |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

commit d0c6448cbc1334ee7e3053761d155f8044ecc6fa
Merge: 68aaff4 1753889
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 17 16:34:33 2012 +0000

    Merge "Call driver for attach/detach_volume."

commit 68aaff4c742d7994c0dcbbd5d8ebf966efa3f38d
Merge: e5b3ef5 b192cfe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 17 15:35:03 2012 +0000

    Merge "Remove unused function"

commit e958531929e04364759a721a689665ef891ff623
Author: RongzeZhu <zrzhit@gmail.com>
Date:   Fri Aug 17 22:24:43 2012 +0800

    Remove logging in volume tests
    
    Fixes bug #932137
    
    Usage of logging seems to be limited to the check_for_export() tests and
    should be to cleanup. check_for_export() raises an exception if there's
    a problem and it does nothing if it succeeds. The tests should just
    check whether an exception was raised.
    
    Change-Id: I72bc3d97aa75950c7f31fae03535c541059501c2

 cinder/tests/test_volume.py |   26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

commit 17538890dc9d005652b2d912cea4a0307e5d6e18
Author: Cory Stone <corystone@gmail.com>
Date:   Fri Aug 17 09:18:52 2012 -0500

    Call driver for attach/detach_volume.
    
    The volume driver may want to know which guest is going to be
    attached to a volume. The manager now calls down into the driver
    on attach_volume and detach_volume.
    
    Fixes bug 1038109.
    
    Change-Id: I084c2d09a1871fa158312f9ba479abb474da1d28

 cinder/volume/driver.py  |    8 ++++++++
 cinder/volume/manager.py |   19 +++++++++++++++++++
 2 files changed, 27 insertions(+)

commit e5b3ef5622fc2662addad17f96a9d903ca68db9b
Author: RongzeZhu <zrzhit@gmail.com>
Date:   Fri Aug 17 11:20:09 2012 +0800

    Fix spelling typos
    
    Fixes for:
    * cinder/locale/*/LC_MESSAGES/nova.po
    * cinder/locale/nova.pot
    * cinder/testing/README.rst
    
    Change-Id: Ib50432a72b2300742169ebe4c77584466be7bfba

 cinder/locale/bs/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/cs/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/da/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/de/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/en_AU/LC_MESSAGES/nova.po |    2 +-
 cinder/locale/en_GB/LC_MESSAGES/nova.po |    2 +-
 cinder/locale/es/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/fr/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/it/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/ja/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/ko/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/nova.pot                  |    2 +-
 cinder/locale/pt_BR/LC_MESSAGES/nova.po |    2 +-
 cinder/locale/ru/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/tl/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/tr/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/uk/LC_MESSAGES/nova.po    |    2 +-
 cinder/locale/zh_CN/LC_MESSAGES/nova.po |    2 +-
 cinder/locale/zh_TW/LC_MESSAGES/nova.po |    2 +-
 cinder/testing/README.rst               |    2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

commit b192cfebb85b4cb6b5f35df3c21ecfa15fc0aa49
Author: RongzeZhu <zrzhit@gmail.com>
Date:   Fri Aug 17 10:07:05 2012 +0800

    Remove unused function
    
    'wait_creation' function in cinder.volume.api.API is unused.
    
    Change-Id: I4062e026b3e227513321be18ee920a4e5882cbd7

 cinder/volume/api.py |    9 ---------
 1 file changed, 9 deletions(-)

commit d2babbfd4b59bde09fe17f7b69c86d857a82d104
Merge: f276d01 6e5ef61
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 16 04:58:27 2012 +0000

    Merge "Remove unused imports"

commit f276d01946710154cac900a6cf98f606d0eb7dd6
Merge: d05ef80 11545df
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 16 04:48:41 2012 +0000

    Merge "Implements bp migrate-nova-volumes-to-cinder"

commit d05ef8007b25fc251e45edbe06884ca425602c0d
Merge: e5910c6 7ea56d2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 16 04:01:24 2012 +0000

    Merge "blueprint zadara-volume-driver"

commit e5910c64916f0b5ba511a730808ce31070565523
Merge: cfc79c7 d807526
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 16 04:01:23 2012 +0000

    Merge "Add driver for using files on a generic NFS server as virtual block devices Add NetApp-specific NFS virtual block driver"

commit cfc79c784dbe6d24f464a8339493a263eb01b7e0
Merge: bc5c955 df5c4ba
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 16 03:23:24 2012 +0000

    Merge "Update SolidFire volume driver"

commit 7ea56d215453a01ac33934a71f801f2e4a99f4ce
Author: Vladimir Popovski <vladimir@zadarastorage.com>
Date:   Fri Aug 10 00:14:26 2012 -0700

    blueprint zadara-volume-driver
    
    Adds support for Zadara VPSA storage arrays as a BackEnd for Cinder
    
    Change-Id: I8c2a163079853d4003223eb2c156cfd2ccef3129

 cinder/exception.py         |   36 +++
 cinder/tests/test_zadara.py |  577 +++++++++++++++++++++++++++++++++++++++++++
 cinder/volume/zadara.py     |  483 ++++++++++++++++++++++++++++++++++++
 3 files changed, 1096 insertions(+)

commit bc5c955036208a89e53a0f39d8c14ee6c927317b
Merge: a75d75b edc1110
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 16 01:37:28 2012 +0000

    Merge "add ability to clone images"

commit a75d75b5cf1dab92d6c0e3c7f73e08c0d70bb2b0
Merge: 6ad3607 0b221c9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 16 01:23:36 2012 +0000

    Merge "Add proper support for deprecation messages"

commit 6ad360741f88c25d97ac9b39844302e79d83e781
Author: Craig Vyvial <cp16net@gmail.com>
Date:   Wed Aug 15 15:50:29 2012 -0500

    Adding the volume notifications to cinder
    
    adding the volume notifications
    added unit tests for notifications
    added context for notify with rabbit
    
    blueprint cinder-notifications
    
    Change-Id: I5aef1e718eebb9a61e0670d524fcd5f438dee016

 bin/volume-usage-audit            |   87 +++++++++++++++++++++++++++++++++++++
 cinder/db/api.py                  |    7 +++
 cinder/db/sqlalchemy/api.py       |   17 ++++++++
 cinder/exception.py               |   48 --------------------
 cinder/tests/test_exception.py    |   13 +++---
 cinder/tests/test_volume.py       |   32 ++++++++++++++
 cinder/tests/test_volume_utils.py |   86 ++++++++++++++++++++++++++++++++++++
 cinder/utils.py                   |   70 +++++++++++++++++++++++++++++
 cinder/volume/manager.py          |   11 +++++
 cinder/volume/utils.py            |   83 +++++++++++++++++++++++++++++++++++
 setup.py                          |    1 +
 11 files changed, 401 insertions(+), 54 deletions(-)

commit edc11101cbc06bdce95b10cfd00a4849f6c01b33
Author: Josh Durgin <josh.durgin@inktank.com>
Date:   Tue Aug 14 12:27:48 2012 -0700

    add ability to clone images
    
    Given the backend location from Glance, drivers can determine
    whether they can clone or otherwise efficiently create a volume
    from the image without downloading all the data from Glance.
    
    For now implement cloning for the RBD driver. There's already a
    Glance backend that stores images as RBD snapshots, so they're
    ready to be cloned into volumes. Fall back to copying all the
    data if cloning is not possible.
    
    Change-Id: I71a8172bd22a5bbf64d4c68631630125fcc7fd34
    Implements: blueprint efficient-volumes-from-images
    Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

 cinder/tests/test_rbd.py |  161 ++++++++++++++++++++++++++++++++++++++++++++++
 cinder/volume/api.py     |    2 +-
 cinder/volume/driver.py  |   83 ++++++++++++++++++++++++
 cinder/volume/manager.py |   23 +++++--
 4 files changed, 261 insertions(+), 8 deletions(-)

commit df5c4ba864732d6534af561ebe2600d738c07f17
Author: John Griffith <john.griffith@solidfire.com>
Date:   Mon Aug 13 18:35:35 2012 -0600

    Update SolidFire volume driver
    
    Implements blueprint update-solidfire-driver
    
    * Updates driver to reflect changes in the release version of SF API
    * Modify SF naming scheme
    * Implement snapshot functionality
    * Implement setting qos on create via metadata
    * Update/Add tests
    
    Change-Id: I08f7aac31e9d95f971d297a19c285dfa7151b931

 cinder/tests/test_SolidFireSanISCSIDriver.py |  186 -----------
 cinder/tests/test_solidfire.py               |  210 +++++++++++++
 cinder/volume/san.py                         |  243 ---------------
 cinder/volume/solidfire.py                   |  423 ++++++++++++++++++++++++++
 4 files changed, 633 insertions(+), 429 deletions(-)

commit 87ba5de73e82ae1a68a23c3eb245fac68597c3e3
Merge: 12aae1a 171a57a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 15 20:15:21 2012 +0000

    Merge "add get_location method for images"

commit 0b221c998338e33627822d9837441c8f24124f90
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Aug 8 17:49:44 2012 +0200

    Add proper support for deprecation messages
    
    Add support for warning once about deprecated options. Use that in
    the rootwrap options deprecation message, and move it to run_as_root
    so that the deprecated message is emitted once and only if used.
    
    Change-Id: I29e39c662b4456256f4c9397f305bfa857972c46

 cinder/common/deprecated.py     |   55 +++++++++++++++++++++++++++++++++++++++
 cinder/exception.py             |    4 +++
 cinder/tests/test_deprecated.py |   46 ++++++++++++++++++++++++++++++++
 cinder/utils.py                 |   15 ++++++-----
 4 files changed, 114 insertions(+), 6 deletions(-)

commit 12aae1a0728629f9e4e4cc2542756653aab2657b
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Aug 10 23:10:18 2012 -0400

    Remove utils.deprecated functions.
    
    We don't seem to use utils.deprecated at all... so lets
    remove it and save ourselves 200 lines of code.
    
    Also moves a couple misc. test cases in utils.py out of the
    DeprecationTest suite and into the GenericUtilsTestCase
    suite.
    
    Change-Id: I96e93d8fa056110057c8855f2ce52c9f55cd4a9b

 cinder/tests/test_utils.py |  200 ++++++++++----------------------------------
 cinder/utils.py            |  167 ------------------------------------
 2 files changed, 45 insertions(+), 322 deletions(-)

commit 8d48d1a2fd8e03e05b02e187eaafce49a8ff571a
Merge: f7938c0 f5ebb33
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 15 17:40:35 2012 +0000

    Merge "Move volume size validation to api layer."

commit f5ebb33f9a0ebc3b8f6d0e0d97e3d4b673106907
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Wed Aug 15 14:10:03 2012 +0100

    Move volume size validation to api layer.
    
    As per the discussion on this patch:
    
      ihttps://review.openstack.org/10540
    
    Change-Id: I5d3031a08aa1e2d17b5fb233ebaec938c66fa88b

 cinder/api/openstack/volume/volumes.py            |   10 +-----
 cinder/tests/api/openstack/volume/test_volumes.py |   12 ++-----
 cinder/tests/test_volume.py                       |   38 +++++++++++++++++++++
 cinder/volume/api.py                              |   13 ++++++-
 4 files changed, 54 insertions(+), 19 deletions(-)

commit f7938c0b96c047490b6eb935cbf882505ce4a811
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Wed Aug 15 10:36:09 2012 +0000

    Map internal exceptions in the nova style.
    
    Fixes LP 1014687.
    
    Adopt the nova idiom of internal exceptions mapped to their
    corresponding HTTP reponse code in the FaultWrapper middleware,
    and also inclusion of their detail message if declared safe for
    external exposure.
    
    Change-Id: I95a3c30466f6951e02f7a182545ff8db8fbecee8

 cinder/api/openstack/__init__.py |   47 +++++++++++++++++-----
 cinder/exception.py              |    7 ++++
 cinder/tests/test_wsgi.py        |   80 +++++++++++++++++++++++++++++++++++++-
 cinder/utils.py                  |   13 +++++++
 4 files changed, 137 insertions(+), 10 deletions(-)

commit d8075263f52489d4f9550376eb5beba2f4c8285d
Author: Ben Swartzlander <bswartz@netapp.com>
Date:   Mon Aug 13 16:57:50 2012 -0400

    Add driver for using files on a generic NFS server as virtual block devices
    Add NetApp-specific NFS virtual block driver
    
    blueprint nfs-files-as-virtual-block-devices
    blueprint netapp-nfs-cinder-driver
    
    Change-Id: I10ef6f3e230fcea2748152313d341db46bffce55

 cinder/tests/test_netapp_nfs.py |  260 ++++++++++++++++
 cinder/tests/test_nfs.py        |  628 +++++++++++++++++++++++++++++++++++++++
 cinder/volume/netapp_nfs.py     |  266 +++++++++++++++++
 cinder/volume/nfs.py            |  309 +++++++++++++++++++
 4 files changed, 1463 insertions(+)

commit 11545df5cb4fde935adec8160154e591cde8d1b9
Author: John Griffith <john.griffith@solidfire.com>
Date:   Wed Aug 8 13:33:08 2012 -0600

    Implements bp migrate-nova-volumes-to-cinder
    
      Helper cmds to transition from nova to cinder
    
      Implements an import section in cinder-manage to transfer
      applicable tables from local or remote Nova database into a
      fresh Cinder database.
    
      Also implements optional method to copy persistent target files.
    
    Change-Id: I2e655e26c55f1986f3b1554726cead9e73ee9bd6

 bin/cinder-manage   |  134 +++++++++++++++++++++++++++++++++++++++++++++++----
 cinder/exception.py |    4 ++
 2 files changed, 129 insertions(+), 9 deletions(-)

commit 5f31f6e6974d097e525dbc3157f716bf069e4702
Merge: b760654 6454235
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 14 20:33:53 2012 +0000

    Merge "Add C-mode driver for NetApp."

commit 171a57a6879683dac5f219a0e8f1080ea687105d
Author: Josh Durgin <josh.durgin@inktank.com>
Date:   Tue Aug 14 12:26:19 2012 -0700

    add get_location method for images
    
    This is useful for determining whether the backend storage for the
    image in Glance is the same as the storage used in a volume driver.
    
    The direct_url is only available in the v2 images API, so add a
    version parameter to each request. As more parts of the v2 API are
    used, this parameter will become more useful.
    
    Change-Id: I5ca06b6d80ffe4118f8dd381ed11283573bce71f
    Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

 cinder/image/glance.py     |   51 ++++++++++++++++++++++++++++++--------------
 cinder/tests/image/fake.py |    4 ++++
 2 files changed, 39 insertions(+), 16 deletions(-)

commit b760654404f96d6a566b84df6ae61cc9630f5028
Merge: ff45e32 f03e2e3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 14 17:24:38 2012 +0000

    Merge "Driver for IBM XIV storage."

commit ff45e32b97a7b87a611715ba61f0ebab5185edc3
Author: Josh Durgin <josh.durgin@inktank.com>
Date:   Mon Aug 13 15:13:06 2012 -0700

    rbd: implement create_volume_from_snapshot
    
    In an upcoming release, rbd will support creating volumes from
    snapshots ('cloning'). To clone a snapshot, it must first be
    'protected', which means it cannot be deleted until it is unprotected.
    A snapshot can only be unprotected if no clones depend on it. Thus,
    translate a failure to unprotect into a SnapshotIsBusy exception.
    
    Also check for remaining snapshots before deleting a volume,
    and raise VolumeIsBusy if any exist. While we're here, tidy up
    the shell arguments to be more readable.
    
    This is backwards compatible since it does not use the new features
    unless they are available in the installed version of rbd.
    
    Change-Id: If4105e7af7ba33f09a15103b53ad675aceb2ebb4
    Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

 cinder/volume/driver.py |   68 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 60 insertions(+), 8 deletions(-)

commit 66afa15568f5077da2376a4129ef04a1e06cc64a
Author: Josh Durgin <josh.durgin@inktank.com>
Date:   Sun Aug 12 02:21:00 2012 -0700

    Replace deprecated client with python-glanceclient
    
    This is a copy of the code that was merged into Nova.
    python-glanceclient is required for Folsom, and for using
    the v2 API.
    
    Implementing blueprint efficient-volumes-from-images
    requires this since it needs to access the v2 API.
    
    Change-Id: Ia088517abab61e824a641d4adf616e08a53a94bc

 cinder/image/glance.py     |  236 +++++++++++++++-----------------------------
 cinder/tests/image/fake.py |   13 +--
 tools/pip-requires         |    2 +-
 3 files changed, 81 insertions(+), 170 deletions(-)

commit 6e5ef61f8f752fad4c2209b5ebc477f47693506e
Author: RongzeZhu <zrzhit@gmail.com>
Date:   Tue Aug 14 22:07:42 2012 +0800

    Remove unused imports
    
    Fixes bug #1036666
    
    Removed unused imports found by:
    find . -type f -name "*py" -exec pylint -r n {} \; | grep -E "Unused imp|^\*"
    
    Change-Id: Iad69354dd47c2a0dfa3a23a95c1a23eb66773b8d

 cinder/api/openstack/common.py                     |    5 -----
 .../volume/contrib/extended_snapshot_attributes.py |    1 -
 .../api/openstack/volume/contrib/volume_actions.py |    2 --
 cinder/api/openstack/wsgi.py                       |    2 --
 cinder/api/sizelimit.py                            |    1 -
 cinder/db/sqlalchemy/migration.py                  |    1 -
 cinder/db/sqlalchemy/models.py                     |    1 -
 cinder/openstack/common/notifier/api.py            |    1 -
 cinder/openstack/common/rpc/common.py              |    2 --
 cinder/test.py                                     |    3 ---
 cinder/testing/runner.py                           |    2 --
 cinder/tests/api/openstack/common.py               |    2 --
 cinder/tests/api/openstack/test_common.py          |    4 ----
 cinder/tests/api/openstack/test_wsgi.py            |    3 ---
 cinder/tests/db/fakes.py                           |    1 -
 cinder/tests/integrated/api/client.py              |    1 -
 cinder/tests/integrated/test_extensions.py         |    1 -
 cinder/tests/integrated/test_xml.py                |    1 -
 cinder/tests/scheduler/fakes.py                    |    2 --
 cinder/tests/scheduler/test_scheduler.py           |    6 ------
 cinder/tests/test_flags.py                         |    2 --
 cinder/tests/test_migrations.py                    |    1 -
 cinder/tests/test_misc.py                          |    7 -------
 cinder/tests/test_quota.py                         |    1 -
 cinder/tests/test_storwize_svc.py                  |    1 -
 cinder/tests/test_test_utils.py                    |    1 -
 cinder/tests/test_utils.py                         |    6 ------
 cinder/volume/netapp.py                            |    1 -
 cinder/volume/storwize_svc.py                      |    1 -
 29 files changed, 63 deletions(-)

commit 3b9379c6fba605589c6b753163e5c8f8670c73bf
Merge: 4f7f295 2f53607
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 14 13:29:46 2012 +0000

    Merge "Adds new volume API extensions"

commit 4f7f295c09a498006be6d8a007698432b1c792d8
Author: Josh Durgin <josh.durgin@inktank.com>
Date:   Mon Aug 13 10:42:27 2012 -0700

    Fix check_for_export() in non-exporting drivers
    
    This overrides the default check_for_export so that drivers that don't
    need to export block devices on the host like Sheepdog and RBD don't
    raise a NotImplemented exception when this is called.
    
    Reported-by: Mark Moseley <moseleymark@gmail.com>
    Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
    
    Change-Id: Icf72f51904e7bdc368bfaf0a91dd0433ce3b1cf6

 cinder/volume/driver.py |    8 ++++++++
 1 file changed, 8 insertions(+)

commit 2f5360753308eb8b10581fc3c026c1b66f42ebdc
Author: Unmesh Gurjar <unmesh.gurjar@vertex.co.in>
Date:   Sat Aug 11 10:31:51 2012 -0700

    Adds new volume API extensions
    
    Adds following extensions:
    1. Create volume from image
    2. Copy volume to image
    
    Added unit tests.
    
    Implements: blueprint create-volume-from-image
    Change-Id: I9c73bd3fa2fa2e0648c01ff3f4fc66f757d7bc3f

 cinder/api/openstack/__init__.py                   |    4 +-
 cinder/api/openstack/extensions.py                 |    3 +
 cinder/api/openstack/volume/__init__.py            |    4 +-
 .../api/openstack/volume/contrib/image_create.py   |   31 ++
 .../api/openstack/volume/contrib/volume_actions.py |   84 +++-
 cinder/api/openstack/volume/volumes.py             |   46 +-
 cinder/flags.py                                    |    3 +
 cinder/image/__init__.py                           |   16 +
 cinder/image/glance.py                             |  492 ++++++++++++++++++++
 cinder/tests/api/openstack/fakes.py                |   13 +-
 .../volume/contrib/test_volume_actions.py          |  149 +++++-
 cinder/tests/api/openstack/volume/test_router.py   |    9 +-
 cinder/tests/api/openstack/volume/test_volumes.py  |  100 +++-
 cinder/tests/image/__init__.py                     |   20 +
 cinder/tests/image/fake.py                         |  248 ++++++++++
 cinder/tests/policy.json                           |    1 +
 cinder/tests/test_volume.py                        |  198 +++++++-
 cinder/utils.py                                    |   15 +-
 cinder/volume/api.py                               |   68 ++-
 cinder/volume/driver.py                            |   22 +
 cinder/volume/manager.py                           |   65 ++-
 etc/cinder/rootwrap.d/volume.filters               |    3 +
 22 files changed, 1553 insertions(+), 41 deletions(-)

commit f03e2e3ca3e31c830c5ef9b22f9b1c3aa8b1557a
Author: Avishay Traeger <avishay@il.ibm.com>
Date:   Sun Aug 12 14:55:04 2012 +0300

    Driver for IBM XIV storage.
    
    Volume driver for IBM XIV storage systems, along with unit tests. The
    driver imports the xiv_openstack_box class, which is a closed-source
    proxy available separately to IBM XIV customers.
    
    Change-Id: I3a3ec8b1d3e3adf1895b4a0bbd86993010d2e447

 cinder/tests/fake_flags.py |    1 +
 cinder/tests/test_xiv.py   |  242 ++++++++++++++++++++++++++++++++++++++++++++
 cinder/volume/xiv.py       |  128 +++++++++++++++++++++++
 3 files changed, 371 insertions(+)

commit dccfa57f6b49d9e92157a3361f42dee0f55bd70c
Merge: 59c55da ac1b465
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 13 07:51:09 2012 +0000

    Merge "Fake requests in tests should be to v1"

commit ac1b465ac3d81516b748740554e6bed8ebefe5ef
Author: Mike Perez <thingee@gmail.com>
Date:   Sun Aug 12 16:20:53 2012 -0700

    Fake requests in tests should be to v1
    
    v2 does not exist, yet.
    
    Change-Id: Id3a332c4d78c87882a7db1a8b98479a3881b0a5f

 .../tests/api/openstack/volume/test_snapshots.py   |    6 +++---
 cinder/tests/api/openstack/volume/test_types.py    |    4 ++--
 cinder/tests/api/openstack/volume/test_volumes.py  |    8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

commit 6454235a27f6c167290ef55a8262277f10d0febf
Author: Ben Swartzlander <bswartz@netapp.com>
Date:   Sun Aug 12 00:43:05 2012 -0400

    Add C-mode driver for NetApp.
    
    blueprint netapp-volume-driver-cmode
    
    Change-Id: I1eb418d05f557068bc0d4f359e19721c9c61068b

 cinder/tests/test_netapp.py |  390 ++++++++++++++++++++++++++++++++++++++++++-
 cinder/volume/netapp.py     |  294 ++++++++++++++++++++++++++++++++
 2 files changed, 683 insertions(+), 1 deletion(-)

commit 59c55dadfdf0da57638f971113563ea0950f57b4
Author: Avishay Traeger <avishay@il.ibm.com>
Date:   Sun Aug 12 11:31:26 2012 +0300

    storwize-svc: improved test coverage and fixes.
    
    Added test cases to cover more error paths, now providing 97% test
    coverage of the storwize-svc driver. Some tests uncovered bugs in the
    driver, which are fixed by this patch. In addition, there are some
    fixes to the code included which address comments from the submission
    of this driver to nova-volume and sync the two versions.
    
    Change-Id: I7c646885a7f2b1e761725c14940f1d741996beb4

 cinder/tests/test_storwize_svc.py |  767 +++++++++++++++++++++++++------------
 cinder/volume/storwize_svc.py     |  139 ++++---
 etc/cinder/cinder.conf.sample     |    4 +-
 3 files changed, 625 insertions(+), 285 deletions(-)

commit 63783084fa012469c25a91017cd3d142483fd09f
Merge: 9a7de84 4bc03ba
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 10 20:34:01 2012 +0000

    Merge "Add iscsiadm path for qauntal."

commit 9a7de84b69650a63ca287d34e363dff897349221
Merge: a2c2448 a4c8e71
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 10 20:25:10 2012 +0000

    Merge "Use openstack.common.notifier."

commit a2c2448e0cc83a173f6d997eecfc36ce41d45a4b
Author: Monty Taylor <mordred@inaugust.com>
Date:   Fri Aug 10 11:55:48 2012 -0400

    Use setuptools-git.
    
    Change-Id: I6861a29d65b809362949f2c54197940fd0988785

 MANIFEST.in         |   40 ++++------------------------------------
 setup.py            |    1 +
 tools/test-requires |    1 +
 3 files changed, 6 insertions(+), 36 deletions(-)

commit 4bc03bab32270b4d6fcd302d3b64ac28e2596bd0
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Aug 10 10:06:50 2012 -0500

    Add iscsiadm path for qauntal.
    
    Resynchronize with nova/etc/nova/rootwrap.d/nova.volumes.
    
    Change-Id: I9737454bb2f48bbd97fe14bca163059e93ef825b
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 etc/cinder/rootwrap.d/volume.filters |    1 +
 1 file changed, 1 insertion(+)

commit 69aa04d1f89c838d2ea1c96e715e175fb26f0883
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Aug 7 16:25:52 2012 -0400

    Create unique volumes_dir for testing.
    
    Updates test_volume.py so that we create a uniq volumes_dir for testing.
    This avoids polluting the source tree with fake volume UUID's when running
    tests.
    
    Change-Id: I3c37083915effec0eff7c8d9bfffb9f7674fe6f5

 cinder/tests/test_volume.py |   19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

commit 6773b92c4e6e8834c8ab699cb6da6d60fde1523e
Merge: df8ef47 1c68bd3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 9 21:33:28 2012 +0000

    Merge "Straight port of the NetApp driver updates from nova-volume to cinder."

commit df8ef4703fd5e43b5031148c37abc5c1b08c1a69
Merge: 3ab7f55 30a5916
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 9 17:34:50 2012 +0000

    Merge "Remove redundant 'availability_zone' config options."

commit 3ab7f55ed1fcebdf990454624b327cebcb2371f5
Merge: e8db777 43626d2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 9 17:33:21 2012 +0000

    Merge "Admin users should be restricted from seeing all snapshots by default."

commit 30a591616687f41af4cfa2605078a436b2bd795d
Author: Zhiteng Huang <zhiteng.huang@intel.com>
Date:   Thu Aug 9 00:41:28 2012 +0800

    Remove redundant 'availability_zone' config options.
    
    There are two availability_zone related config options now:
      node_availability_zone and storage_availability_zone
    While volume API uses node_availability_zone, the scheduler uses
    the other, which causes failure in scheduler when these two options
    have different values.
    
    This patch removes 'node_availability_zone' so that end user
    can specify 'availability zone' when create volumes using
    Simple scheduler.
    
    Partially implement blueprint implement-availability-zones
    
    Change-Id: Ia2f0710908495ec64dacd2ee9bd10d7f8cd415df

 cinder/flags.py               |    2 +-
 cinder/scheduler/simple.py    |    2 +-
 cinder/service.py             |    4 ++--
 cinder/volume/api.py          |    1 -
 cinder/volume/manager.py      |    4 ----
 etc/cinder/cinder.conf.sample |    4 +---
 6 files changed, 5 insertions(+), 12 deletions(-)

commit 1c68bd3c617edca059d6a5ee1c95f5567c26861a
Author: Ben Swartzlander <bswartz@netapp.com>
Date:   Wed Aug 8 14:27:44 2012 -0400

    Straight port of the NetApp driver updates from nova-volume to cinder.
    
    These changes were already accepted into nova-volume, and I have only
    altered the exception classes to match the new cinder classes.
    
    blueprint netapp-volume-driver
    
    Change-Id: I0d59db64e00bc7e93223a24dabadbcbd0b290fb9

 cinder/tests/test_netapp.py |  119 ++++++--
 cinder/volume/netapp.py     |  643 ++++++++++++++++++++++++++++++++-----------
 2 files changed, 572 insertions(+), 190 deletions(-)

commit e8db777de63e2308c12a8c3b54e7a0ed54f8a068
Merge: 3905a99 2b2c97e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 7 23:49:59 2012 +0000

    Merge "Deprecate root_helper in favor of rootwrap_config"

commit 3905a9902606871bbe92fe7c48480db3349ea316
Author: Ronen Kat <ronenkat@il.ibm.com>
Date:   Mon Aug 6 10:11:10 2012 +0300

    Use volume driver specific execeptions.
    
    Change generic use of exception.Error in the cinder/volume directory
    to specific exceptions. The exceptions used in this patch are:
    exception.VolumeBackendAPIException
    exception.InvalidInput
    exception.InvalidVolume
    exceptio.VolumeAtatched
    Patch includes updates to the appropriate tests as well.
    
    Change-Id: I10407ff3f5babe64e88f445d3529269b7665ee16

 cinder/exception.py                   |    6 +++-
 cinder/tests/test_HpSanISCSIDriver.py |    2 +-
 cinder/tests/test_storwize_svc.py     |    2 +-
 cinder/tests/test_volume.py           |    2 +-
 cinder/volume/driver.py               |   22 +++++++-----
 cinder/volume/manager.py              |    6 ++--
 cinder/volume/netapp.py               |   43 +++++++++++-----------
 cinder/volume/san.py                  |   27 +++++++-------
 cinder/volume/storwize_svc.py         |   63 +++++++++++++++++----------------
 cinder/volume/xensm.py                |   34 +++++++++++-------
 10 files changed, 118 insertions(+), 89 deletions(-)

commit e6e1e983695fdc59650c7a4f3013c0e5338144cc
Merge: c02c5a7 c401895
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 7 04:09:00 2012 +0000

    Merge "Add persistent volumes for tgtd."

commit c02c5a76cb1e59dca94ea2bc13ad890c02965d6d
Merge: a1b4bd5 99456bd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 7 03:50:25 2012 +0000

    Merge "Send 'create volume from snapshot' to the proper host"

commit 43626d293739dbe06c7fe26845d17c2e580e62dd
Author: jakedahn <jake@ansolabs.com>
Date:   Sun Aug 5 14:32:07 2012 -0700

    Admin users should be restricted from seeing all
    snapshots by default.
    
      * Now to view all snapshots across all tenants you need
        to include the all_tenants=1 GET param in your api request.
      * Fixes remaining issues blocking bug #967882
    
    Change-Id: I2a8338d77badc70201bb315198183f2091df43fb

 cinder/api/openstack/volume/snapshots.py           |    6 ++-
 cinder/tests/api/openstack/fakes.py                |   26 +++++++++++++
 .../contrib/test_extended_snapshot_attributes.py   |    2 +-
 .../tests/api/openstack/volume/test_snapshots.py   |   41 ++++++++++++++++++--
 cinder/volume/api.py                               |   13 +++++--
 5 files changed, 79 insertions(+), 9 deletions(-)

commit a4c8e71e0895f6652d1e2c8fbb06b6b2447b6086
Author: Chmouel Boudjnah <chmouel@chmouel.com>
Date:   Mon Aug 6 10:25:31 2012 +0200

    Use openstack.common.notifier.
    
    - Update openstack.common.log to use it (and fixes #1030078 for cinder as
      well so we can get review I9d4251b4292188c0174ebac1dcd98318df44c0e3
      working).
    - Don't use openstack.common.context but our own just yet.
    
    Change-Id: I10feda623788a3b2418cad6bf55cbdb860ba8ee7

 cinder/exception.py                                |    7 +-
 cinder/flags.py                                    |    2 +-
 cinder/notifier/__init__.py                        |   14 --
 cinder/notifier/api.py                             |  135 -------------------
 cinder/notifier/capacity_notifier.py               |   81 -----------
 cinder/notifier/list_notifier.py                   |   71 ----------
 cinder/notifier/log_notifier.py                    |   34 -----
 cinder/notifier/no_op_notifier.py                  |   19 ---
 cinder/notifier/rabbit_notifier.py                 |   46 -------
 cinder/notifier/test_notifier.py                   |   25 ----
 cinder/openstack/common/cfg.py                     |    5 +-
 cinder/openstack/common/exception.py               |    1 -
 cinder/openstack/common/jsonutils.py               |    6 +-
 cinder/openstack/common/log.py                     |   37 +++--
 cinder/openstack/common/notifier/__init__.py       |   14 ++
 cinder/openstack/common/notifier/api.py            |  142 ++++++++++++++++++++
 cinder/openstack/common/notifier/list_notifier.py  |  118 ++++++++++++++++
 cinder/openstack/common/notifier/log_notifier.py   |   35 +++++
 cinder/openstack/common/notifier/no_op_notifier.py |   19 +++
 .../openstack/common/notifier/rabbit_notifier.py   |   46 +++++++
 cinder/openstack/common/notifier/test_notifier.py  |   22 +++
 cinder/openstack/common/rpc/common.py              |    6 +-
 cinder/openstack/common/rpc/impl_qpid.py           |    2 +-
 cinder/openstack/common/rpc/proxy.py               |   12 +-
 cinder/openstack/common/setup.py                   |    6 +-
 cinder/openstack/common/timeutils.py               |    1 -
 cinder/tests/notifier/__init__.py                  |   16 ---
 cinder/tests/notifier/test_list_notifier.py        |   84 ------------
 cinder/tests/scheduler/test_scheduler.py           |    2 +-
 cinder/tests/test_exception.py                     |    2 +-
 cinder/tests/test_notifier.py                      |  133 ------------------
 cinder/utils.py                                    |    5 +-
 etc/cinder/cinder.conf.sample                      |   10 +-
 openstack-common.conf                              |    2 +-
 34 files changed, 449 insertions(+), 711 deletions(-)

commit a1b4bd5e86cd865869308c976c6aebf9a4ad23a8
Author: jakedahn <jake@ansolabs.com>
Date:   Tue Jul 31 16:35:26 2012 -0700

    Admin users should be restricted from seeing all
    volumes by default.
    
      * Now to view all volumes across all tenants you need
        to include the all_tenants=1 GET param in your api request.
      * Fixes remaining issues blocking bug #967882
    
    Change-Id: Ie9d74e9c09fa0c192ab6257b5fb02d65b593cbfb

 cinder/api/openstack/volume/volumes.py            |   27 ++++++++++++++-
 cinder/tests/api/openstack/fakes.py               |    8 ++++-
 cinder/tests/api/openstack/volume/test_volumes.py |   37 ++++++++++++++++++++-
 cinder/volume/api.py                              |   13 +++++---
 4 files changed, 78 insertions(+), 7 deletions(-)

commit 2b2c97eb5ca332ce7d1f83e4fd2e81fabe0acb66
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Aug 3 15:35:03 2012 +0200

    Deprecate root_helper in favor of rootwrap_config
    
    Align with recent changes in nova-rootwrap by marking the
    root_helper option deprecated and introduce usage of the
    rootwrap_config option instead. The root_helper option will still
    fully be supported in Folsom, but will be removed in Grizzly.
    
    Transition notes: you should replace:
    root_helper=sudo cinder-rootwrap /etc/cinder/rootwrap.conf
    
    by:
    rootwrap_config=/etc/cinder/rootwrap.conf
    
    Change-Id: I22a6d2bdee6ad2c5ad587ceec574cec4b2887f22

 bin/cinder-rootwrap |    2 +-
 cinder/flags.py     |    6 +++++-
 cinder/utils.py     |   14 ++++++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

commit 99456bd690445443ae05c0d4fe1ec43ba6090f6f
Author: ZhuRongze <zrzhit@gmail.com>
Date:   Fri Jul 13 12:07:13 2012 +0000

    Send 'create volume from snapshot' to the proper host
    
    A simple solution for bug 1008866. When creating volume from snapshot on
    multicluster, in volume it will check if snapshot_id is set. If snapshot_id
    is set, make the call create volume directly to the volume host where the
    snapshot resides instead of passing it through the scheduler. So snapshot can
    be copy to new volume.
    
    Change-Id: Ie9c1a77f62abc40e294b1d0c604cf885652728da

 cinder/volume/api.py          |   40 ++++++++++++++++++++++++++++++++++------
 etc/cinder/cinder.conf.sample |    5 +++++
 2 files changed, 39 insertions(+), 6 deletions(-)

commit c401895f8f2b6f1693601f7996da88d7b3d45fa0
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Jul 27 12:05:55 2012 -0500

    Add persistent volumes for tgtd.
    
    Currently if you restart the server running nova-volume
    or restart tgt, you will loose your iscsi targets that
    have been created. This is not good.
    
    In order for iscsi targets to be persistent across
    reboots or restarts, one has to have the target's configuration
    information in /etc/tgt/targets.conf or /etc/tgt/conf.d.
    So when tgtd is restarted then the iscsi targets will be there
    as expected.
    
    This patch will add a configuration file to $state_path/volumes
    when the volume is created. The configuration file is identified by
    the volume uuid. It creates a logicalunit when the volume is created
    as well. The iscsi target and configuration file
    will be removed once the volume has been removed as well.
    
    In order to use this, you have to include the following in
    your /etc/tgt/targets.conf
    
    include $state_path/volumes/*
    
    For upgrades, it will just re-create the volumes
    already in the volumes table.
    
    Fixes LP: #1011159
    
    Change-Id: Ib74dcc1efa0332842041b4c045ca5fa85d4a32ca
    Signed-off-by: Chuck Short <zulcss@ubuntu.com>

 cinder/tests/test_iscsi.py           |   40 ++++------
 cinder/volume/driver.py              |   12 ++-
 cinder/volume/iscsi.py               |  137 ++++++++++++++++++++++------------
 etc/cinder/rootwrap.d/volume.filters |    1 +
 4 files changed, 111 insertions(+), 79 deletions(-)

commit 0be1725cdcc6d0706475aca3444f108ba76db246
Merge: 6e781fc 053837f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 1 18:40:04 2012 +0000

    Merge "Include AUTHORS file in MANIFEST.in"

commit 6e781fc4b04a5e60e5b8de194931d9f00dda2150
Merge: b765b6b f758bde
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 1 18:40:01 2012 +0000

    Merge "Scheduler-clean-up"

commit b765b6b7e0814c4ecd71bf434a856d2d86d75f50
Merge: 424e6af c01bf56
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 1 18:40:00 2012 +0000

    Merge "Add authors for IBM Storwize and SVC driver."

commit f758bde47439be52a743b2b4181d4900f2c1bc8a
Author: ZhuRongze <zrzhit@gmail.com>
Date:   Sat Jul 28 08:14:03 2012 +0000

    Scheduler-clean-up
    
    Some instance related functions and opts were still present in Cinder
    Scheduler.
    
    Remove the functions and opts and modify some computer related comments.
    
    Change-Id: Ia01099e66bcbb129493870dfbf212d5e6669ebe1

 cinder/scheduler/__init__.py          |    2 +-
 cinder/scheduler/chance.py            |   24 +------
 cinder/scheduler/driver.py            |   55 ---------------
 cinder/scheduler/manager.py           |  119 ++-------------------------------
 cinder/scheduler/simple.py            |   66 ------------------
 cinder/tests/scheduler/test_rpcapi.py |    2 -
 cinder/tests/test_quota.py            |   11 +--
 etc/cinder/cinder.conf.sample         |    6 --
 8 files changed, 7 insertions(+), 278 deletions(-)

commit 053837f89b01beb6c3b09cd753e3ccb1ba32b4c9
Author: Chmouel Boudjnah <chmouel@chmouel.com>
Date:   Wed Aug 1 09:05:24 2012 +0200

    Include AUTHORS file in MANIFEST.in
    
    Change-Id: I4b2ddeaaaa5f58eafd25cba6bd613c6fe477ad4d

 MANIFEST.in |    1 +
 1 file changed, 1 insertion(+)

commit 424e6af7c0ade3128826f7262a87df9e040f67af
Merge: 7d30cb0 5b605b6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 1 05:27:11 2012 +0000

    Merge "Include volume_metadata with object on vol create"

commit c01bf56ba9b89600bbd913bb094fc1164bfa4559
Author: Avishay Traeger <avishay@il.ibm.com>
Date:   Tue Jul 31 21:47:57 2012 +0300

    Add authors for IBM Storwize and SVC driver.
    
    Change-Id: I0d48dd6ce595e6bd9801478fc0b90bcb8fdf5947
    Co-authored-by: Ronen Kat <ronenkat@il.ibm.com>

 cinder/tests/test_storwize_svc.py |    4 ++++
 cinder/volume/storwize_svc.py     |    4 ++++
 2 files changed, 8 insertions(+)

commit 7d30cb059a7ac262a40eaa367349f045fbe6362c
Merge: 0d8e026 097acdd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 31 16:22:25 2012 +0000

    Merge "Remove unused instance_name_template flag"

commit 0d8e026dab830d0a1e836f7e3f1d84ea7ccfd6a4
Author: Avishay Traeger <avishay@il.ibm.com>
Date:   Sun Jul 15 15:53:36 2012 +0300

    Driver for IBM Storwize and SVC storage.
    
    Volume driver for IBM Storwize and SVC storage systems, along with unit
    tests and updated sample config file. The unit tests include a
    Storwize/SVC management simulator to allow for testing without
    controller hardware. Also added a new exception for volume drivers.
    
    Change-Id: Id7e3e79cd6e62fac4b10937b6f1b5f6bcb7908fe

 cinder/exception.py               |    5 +
 cinder/tests/test_storwize_svc.py |  939 +++++++++++++++++++++++++++++
 cinder/volume/storwize_svc.py     | 1200 +++++++++++++++++++++++++++++++++++++
 etc/cinder/cinder.conf.sample     |   19 +-
 4 files changed, 2162 insertions(+), 1 deletion(-)

commit 097acddf82b937a042c2591da02da3b2092a1519
Author: ZhuRongze <zrzhit@gmail.com>
Date:   Sat Jul 28 07:28:50 2012 +0000

    Remove unused instance_name_template flag
    
    Only used in nova/db/sqlalchemy/models
    
    Change-Id: I1029848bb639402cad30c01b51630c0ddd9dd7b8

 cinder/db/api.py              |    3 ---
 etc/cinder/cinder.conf.sample |    2 --
 2 files changed, 5 deletions(-)

commit 62af23cff67791781e5851ad83334857752eae36
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Mon Jul 30 16:11:18 2012 +0100

    Allow XML payload for volume creation.
    
    Fixes cinder aspect of LP 1030330
    
    Tolerate volume size attribute of type string as opposed to int.
    
    Change-Id: I8d300a6c23c2e4e92187e26260ce49da35590545

 cinder/api/openstack/volume/volumes.py            |   12 +++++++++++-
 cinder/tests/api/openstack/volume/test_volumes.py |   10 ++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

commit 5b605b6b8ae00f51deac5e0531f7aeda9bd11019
Author: John Griffith <john.griffith@solidfire.com>
Date:   Fri Jul 27 22:30:47 2012 -0600

    Include volume_metadata with object on vol create
    
    Fix for Bug 1029762
    
    The symptom of this bug is that the response data of an
    OSAPI create call always shows and empty dict for volume_metadata
    regardless of what was passed in to created and actually used.
    
    Upon the db create_volume call a reference to the volume
    object is all that was being returned.  Since metadata is
    specified and set, it should also be returned with the
    create reference object.
    
    This will result in the the osapi create call returning
    a body with correct metdata info rather than always showing
    and empty dict as it was previously.
    
    Change-Id: I9ae9c737bd2aa5bfa14c19fe8b8b2a7a5aa4d43a

 cinder/db/sqlalchemy/api.py |   11 ++++++++++-
 cinder/tests/test_volume.py |   20 +++++++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

commit 95262bb692746ca89dc01337357c4329766df5e5
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Thu Jul 26 16:26:55 2012 +0000

    Trim volume type representation.
    
    Fixes cinder aspect of LP 1027281.
    
    Use view builder pattern to only include non-extraneous
    volume type attributes in the representation.
    
    Change-Id: I33f1b579fd6ed4ed98fa04e9148e91eca125213e

 .../api/openstack/volume/contrib/types_manage.py   |    5 +-
 cinder/api/openstack/volume/types.py               |   10 ++--
 cinder/api/openstack/volume/views/types.py         |   34 ++++++++++++++
 cinder/tests/api/openstack/volume/test_types.py    |   48 ++++++++++++++++++++
 4 files changed, 93 insertions(+), 4 deletions(-)

commit cdaf23ea960f64d62140f5c5807f5c2fd8ca9feb
Merge: 46e3e73 612b1bd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 24 23:25:38 2012 +0000

    Merge "Don't do PEP8 test for openstack-common code."

commit 46e3e73bf7b37ffdd8bcdab93442cebc78d09d4d
Merge: d2d3c9c 111b753
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 24 23:20:41 2012 +0000

    Merge "Cleanup unused code in servce.py"

commit d2d3c9cba4a647724f75c036a1985a10c966da35
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon Jul 23 16:21:28 2012 +0200

    Port nova-rootwrap changes to cinder-rootwrap
    
    Port recent nova-rootwrap changes to cinder-rootwrap, including:
    * Move filter definition from Python module to configuration files
    * Fix tests execution on Fedora (bug 1027814)
    * Remove executable bit on cinder/rootwrap files
    
    This certainly needs a matching change to devstack to pass gating.
    
    Change-Id: I963bc7890ba285ae515ea61bbd960bd2523f9061

 bin/cinder-rootwrap                  |   33 ++++++++++++++++---------
 cinder/rootwrap/filters.py           |   19 ++++++++------
 cinder/rootwrap/volume.py            |   45 ----------------------------------
 cinder/rootwrap/wrapper.py           |   42 +++++++++++++++++++------------
 cinder/tests/test_nova_rootwrap.py   |   38 +++++++++++++---------------
 etc/cinder/rootwrap.conf             |    7 ++++++
 etc/cinder/rootwrap.d/volume.filters |   27 ++++++++++++++++++++
 7 files changed, 112 insertions(+), 99 deletions(-)

commit 612b1bd95510252721ba1a0531bd27e2706cad1d
Author: Zhiteng Huang <zhiteng.huang@intel.com>
Date:   Mon Jul 23 14:39:48 2012 +0800

    Don't do PEP8 test for openstack-common code.
    
    Pep8 test reports issue on openstack-common modules, which would
    fail CI test. Pep8 test should skip openstack-common and assuming
    they are problem-free code. Even it's not, bug/fix should go to
    openstack-common first, then resync back to Cinder.  Therefore,
    Cinder should skip pep8 test for openstack-common code.
    
    Fix bug #1027774
    
    Change-Id: I22c45542401022a6bad9f2320e8657f972915f69

 run_tests.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 111b7534b602d62e4984ada998f757038677b745
Author: Zhiteng Huang <zhiteng.huang@intel.com>
Date:   Mon Jul 23 11:17:26 2012 +0800

    Cleanup unused code in servce.py
    
    Remove unused code in Service() class which is meant to be used
    by 'nova-compute'.
    
    Change-Id: Iadd58914c7fb7a581f9878880908aabcfa5733d6
    Signed-off-by: zhiteng.huang@intel.com

 cinder/service.py |    3 ---
 1 file changed, 3 deletions(-)

commit 3a2036cccb2852b29d2aca15bd25d9e4ad919bcc
Author: Chmouel Boudjnah <chmouel@chmouel.com>
Date:   Fri Jul 20 12:26:18 2012 +0000

    Use openstack.common.setup.
    
    - Remove Authors and add it to .gitignore since this is now auto
      generated.
    
    Change-Id: I513b362a0ea8aca9cf5e06807834316b46a5f430

 .gitignore                       |    3 +
 .mailmap                         |    2 +-
 Authors                          |   54 ------
 cinder/openstack/common/setup.py |  360 ++++++++++++++++++++++++++++++++++++++
 cinder/tests/test_misc.py        |   28 ---
 openstack-common.conf            |    2 +-
 setup.py                         |   36 +---
 7 files changed, 367 insertions(+), 118 deletions(-)

commit 1cd9f0426437099be05d609abb32781941ac7af4
Merge: 9a5e830 56701c3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 20 16:41:01 2012 +0000

    Merge "Remove unused fake memcache client"

commit 9a5e830c2453b0e4fd93c56173881ce43cffc3e8
Author: Mike Perez <thingee@gmail.com>
Date:   Fri Jul 20 08:59:40 2012 -0700

    utils module is still being used by cinder-volume service
    
    bug 1026949
    
    Change-Id: I7327d94b5a9f35bc74e179a05976d511c6642a7a

 bin/cinder-volume |    1 +
 1 file changed, 1 insertion(+)

commit d8ae1541c43b3586bc1b6dd25639727e5618ae79
Merge: 797fe5f fe716c0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 20 15:08:03 2012 +0000

    Merge "Use openstack.common.log for logging."

commit 797fe5f81caf2adc442e447def5c7ef843f79171
Merge: 635f149 c99bae9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 20 15:06:36 2012 +0000

    Merge "Remove unused check_snapshots_enabled"

commit 56701c3eb0dfa0db90bc686ba49dd978da974106
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Jul 17 03:58:01 2012 +0100

    Remove unused fake memcache client
    
    Used by the consoleauth service and the EC2 and metadata APIs in Nova.
    
    Change-Id: I3048d9ab7b1d30eff583e15044c5a7bf74d52a3c

 cinder/common/memorycache.py |   65 ------------------------------------------
 1 file changed, 65 deletions(-)

commit c99bae92e8aa3a38d5e3411e71df0d65a9484298
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Jul 17 04:15:32 2012 +0100

    Remove unused check_snapshots_enabled
    
    Only used in Nova by the createImage action.
    
    Change-Id: I114281fd553020ac96c499c18ff3e4a2a626c3b2

 cinder/api/openstack/common.py |   12 ------------
 etc/cinder/cinder.conf.sample  |    5 -----
 2 files changed, 17 deletions(-)

commit fe716c0ee499ed13f37231c651b8e018baede772
Author: Chmouel Boudjnah <chmouel@chmouel.com>
Date:   Fri Jul 20 10:53:41 2012 +0000

    Use openstack.common.log for logging.
    
    - We are not using openstack.common.notifier just yet so handedit
      openstack.common.log to use cinder.notifier now.
    
    Change-Id: I9d912904c53a8ef5d90b4ab5792f5577701b6817

 Authors                                            |    1 +
 bin/cinder-all                                     |    4 +-
 bin/cinder-api                                     |    4 +-
 bin/cinder-manage                                  |    4 +-
 bin/cinder-scheduler                               |    4 +-
 bin/cinder-volume                                  |    4 +-
 bin/clear_rabbit_queues                            |    4 +-
 cinder/api/auth.py                                 |    2 +-
 cinder/api/openstack/__init__.py                   |    2 +-
 cinder/api/openstack/auth.py                       |    2 +-
 cinder/api/openstack/common.py                     |    2 +-
 cinder/api/openstack/extensions.py                 |    2 +-
 cinder/api/openstack/urlmap.py                     |    2 +-
 cinder/api/openstack/volume/__init__.py            |    2 +-
 cinder/api/openstack/volume/contrib/__init__.py    |    2 +-
 .../volume/contrib/extended_snapshot_attributes.py |    2 +-
 .../api/openstack/volume/contrib/volume_actions.py |    2 +-
 cinder/api/openstack/volume/extensions.py          |    2 +-
 cinder/api/openstack/volume/snapshots.py           |    2 +-
 cinder/api/openstack/volume/volumes.py             |    2 +-
 cinder/api/openstack/wsgi.py                       |    2 +-
 cinder/api/sizelimit.py                            |    2 +-
 cinder/context.py                                  |    2 +-
 cinder/db/sqlalchemy/api.py                        |    2 +-
 .../migrate_repo/versions/001_cinder_init.py       |    2 +-
 cinder/db/sqlalchemy/migration.py                  |    2 +-
 cinder/db/sqlalchemy/session.py                    |    2 +-
 cinder/exception.py                                |    2 +-
 cinder/flags.py                                    |   16 -
 cinder/log.py                                      |  416 ------------------
 cinder/manager.py                                  |    2 +-
 cinder/notifier/api.py                             |    2 +-
 cinder/notifier/capacity_notifier.py               |    2 +-
 cinder/notifier/list_notifier.py                   |    2 +-
 cinder/notifier/log_notifier.py                    |    2 +-
 cinder/notifier/rabbit_notifier.py                 |    2 +-
 cinder/openstack/common/exception.py               |    1 +
 cinder/openstack/common/excutils.py                |    2 +-
 cinder/openstack/common/importutils.py             |   22 +-
 cinder/openstack/common/iniparser.py               |    3 +-
 cinder/openstack/common/log.py                     |  459 ++++++++++++++++++++
 cinder/openstack/common/rpc/impl_zmq.py            |    2 +-
 cinder/scheduler/driver.py                         |    2 +-
 cinder/scheduler/manager.py                        |    2 +-
 cinder/service.py                                  |    2 +-
 cinder/test.py                                     |    2 +-
 cinder/testing/runner.py                           |    4 +-
 cinder/tests/api/openstack/volume/test_router.py   |    2 +-
 .../tests/api/openstack/volume/test_snapshots.py   |    2 +-
 cinder/tests/fake_utils.py                         |    2 +-
 cinder/tests/integrated/api/client.py              |    2 +-
 cinder/tests/integrated/integrated_helpers.py      |    2 +-
 cinder/tests/integrated/test_extensions.py         |    2 +-
 cinder/tests/integrated/test_login.py              |    2 +-
 cinder/tests/integrated/test_volumes.py            |    2 +-
 cinder/tests/integrated/test_xml.py                |    2 +-
 cinder/tests/notifier/test_list_notifier.py        |    2 +-
 cinder/tests/test_HpSanISCSIDriver.py              |    2 +-
 cinder/tests/test_SolidFireSanISCSIDriver.py       |    2 +-
 cinder/tests/test_log.py                           |  217 ---------
 cinder/tests/test_migrations.py                    |    2 +-
 cinder/tests/test_netapp.py                        |    2 +-
 cinder/tests/test_notifier.py                      |    6 +-
 cinder/tests/test_volume.py                        |    7 +-
 cinder/tests/test_volume_types.py                  |    2 +-
 cinder/utils.py                                    |    2 +-
 cinder/volume/api.py                               |    2 +-
 cinder/volume/driver.py                            |    2 +-
 cinder/volume/manager.py                           |    2 +-
 cinder/volume/netapp.py                            |    2 +-
 cinder/volume/nexenta/jsonrpc.py                   |    2 +-
 cinder/volume/nexenta/volume.py                    |    2 +-
 cinder/volume/san.py                               |    2 +-
 cinder/volume/volume_types.py                      |    2 +-
 cinder/volume/xensm.py                             |    2 +-
 cinder/wsgi.py                                     |    2 +-
 etc/cinder/logging_sample.conf                     |    4 +-
 openstack-common.conf                              |    2 +-
 78 files changed, 564 insertions(+), 736 deletions(-)

commit 635f1498757d5ab8a0a8957d6e5aafaf3ceee022
Author: Mike Perez <thingee@gmail.com>
Date:   Thu Jul 19 23:35:32 2012 -0700

    Don't create volumes if an incorrect size was given
    
    bug 1006875
    
    Change-Id: Ied4c6f6d03c0a70838e1e483d69f3ed1ec08a9b5

 Authors                                           |    1 +
 cinder/tests/api/openstack/volume/test_volumes.py |   13 +++++++++++++
 cinder/volume/api.py                              |    3 +++
 3 files changed, 17 insertions(+)

commit 3536ee616f0e381704ea0f7dfc7d1c7dc16c665e
Merge: ae28dc0 8b6397b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 19 17:03:09 2012 +0000

    Merge "Remove some unused helper scripts"

commit ae28dc01b335cbc2b264dfca8962fe59934ab432
Merge: 16158d1 23df265
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 19 16:57:18 2012 +0000

    Merge changes I4e00ca81,I223aca1a
    
    * changes:
      Remove unused get_{id,version}_from_href()
      Remove unused metadata serialization

commit 16158d18045c2ebc4ae724619659dc53d81e5c8e
Merge: 897b5e3 fbf1ee2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 19 16:56:14 2012 +0000

    Merge "Remove unused OverLimitFault"

commit 897b5e3b4beb364fd6a053eb5bba9540a317d1d1
Merge: f49c947 c73d15d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 19 16:54:48 2012 +0000

    Merge "Remove unused wrap_errors decorator"

commit f49c947b0fef819997a461bf94dd30b31c9f9b96
Merge: 05b661e 03700f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 19 16:53:43 2012 +0000

    Merge "Remove unused raise_http_conflict_for_instance_invalid_state()"

commit 05b661e967d004d458ab6326635e8463695554fa
Merge: 15f971d ed7e05b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 19 16:52:28 2012 +0000

    Merge "Remove unused enabled_apis flag"

commit 15f971de5bce79648f812209df0f82622a3711d0
Author: Russell Bryant <rbryant@redhat.com>
Date:   Wed Jun 13 10:48:54 2012 -0400

    Use rpc from openstack-common.
    
    Final patch for blueprint common-rpc.
    
    This patch removes cinder.rpc in favor of the copy in openstack-common.
    
    Change-Id: I9c2f6bdbe8cd0c44417f75284131dbf3c126d1dd

 bin/cinder-manage                         |    2 +-
 bin/clear_rabbit_queues                   |    2 +-
 cinder/manager.py                         |    2 +-
 cinder/notifier/rabbit_notifier.py        |    2 +-
 cinder/openstack/common/rpc/__init__.py   |  264 ++++++++++
 cinder/openstack/common/rpc/amqp.py       |  418 ++++++++++++++++
 cinder/openstack/common/rpc/common.py     |  315 ++++++++++++
 cinder/openstack/common/rpc/dispatcher.py |  150 ++++++
 cinder/openstack/common/rpc/impl_fake.py  |  184 +++++++
 cinder/openstack/common/rpc/impl_kombu.py |  751 +++++++++++++++++++++++++++++
 cinder/openstack/common/rpc/impl_qpid.py  |  599 +++++++++++++++++++++++
 cinder/openstack/common/rpc/impl_zmq.py   |  725 ++++++++++++++++++++++++++++
 cinder/openstack/common/rpc/matchmaker.py |  258 ++++++++++
 cinder/openstack/common/rpc/proxy.py      |  161 +++++++
 cinder/rpc/__init__.py                    |  239 ---------
 cinder/rpc/amqp.py                        |  406 ----------------
 cinder/rpc/common.py                      |  295 -----------
 cinder/rpc/dispatcher.py                  |  105 ----
 cinder/rpc/impl_fake.py                   |  179 -------
 cinder/rpc/impl_kombu.py                  |  744 ----------------------------
 cinder/rpc/impl_qpid.py                   |  566 ----------------------
 cinder/rpc/proxy.py                       |  161 -------
 cinder/scheduler/driver.py                |    3 +-
 cinder/scheduler/rpcapi.py                |    4 +-
 cinder/service.py                         |    2 +-
 cinder/tests/fake_flags.py                |    2 +-
 cinder/tests/rpc/__init__.py              |   19 -
 cinder/tests/rpc/common.py                |  270 -----------
 cinder/tests/rpc/test_common.py           |  147 ------
 cinder/tests/rpc/test_dispatcher.py       |  109 -----
 cinder/tests/rpc/test_fake.py             |   33 --
 cinder/tests/rpc/test_kombu.py            |  371 --------------
 cinder/tests/rpc/test_kombu_ssl.py        |   66 ---
 cinder/tests/rpc/test_proxy.py            |  124 -----
 cinder/tests/rpc/test_qpid.py             |  343 -------------
 cinder/tests/scheduler/test_rpcapi.py     |    2 +-
 cinder/tests/scheduler/test_scheduler.py  |    4 +-
 cinder/tests/test_notifier.py             |    6 +-
 cinder/tests/test_quota.py                |    4 +-
 cinder/tests/test_test.py                 |    2 +-
 cinder/tests/test_volume.py               |    2 +-
 cinder/volume/api.py                      |    2 +-
 cinder/volume/manager.py                  |    2 +-
 openstack-common.conf                     |    2 +-
 44 files changed, 3847 insertions(+), 4200 deletions(-)

commit 84b7025547455d1f83d0fc20c7b9de0a3291f9e6
Author: Russell Bryant <rbryant@redhat.com>
Date:   Mon Jul 2 11:30:10 2012 -0400

    Add missing gettextutils from openstack-common.
    
    This patch adds gettextutils from openstack-common to cinder.  It is used
    by rpc, so some parts of rpc are broken without this patch.
    
    Change-Id: I0830319f4e2011b87180abcc24354c935bea8d16

 cinder/openstack/common/gettextutils.py |   33 +++++++++++++++++++++++++++++++
 openstack-common.conf                   |    2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

commit 1b3cbc537ee1b69940cfb3a5d5b408db13df266d
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 1 17:31:26 2012 -0400

    Use save_and_reraise_exception() from common.
    
    This patch common.excutils from openstack-common, which includes
    save_and_reraise_exception().  The patch also converts the code
    base to use it from there instead of cinder.utils and then removes
    it from cinder.utils.
    
    The initial motivation for this was removing another cinder dependency
    from cinder.rpc so that it can eventually be moved to openstack-common.
    
    Change-Id: I7354ca51a02aec9c709cf33f77d4abc46acc2742

 cinder/openstack/common/excutils.py |   49 +++++++++++++++++++++++++++++++++++
 cinder/rpc/amqp.py                  |    5 ++--
 cinder/scheduler/manager.py         |    8 +++---
 cinder/utils.py                     |   33 +++--------------------
 cinder/volume/manager.py            |    9 ++++---
 openstack-common.conf               |    2 +-
 6 files changed, 66 insertions(+), 40 deletions(-)

commit 0f362edeb03177c12a65b9587d13df7aac76a2f7
Author: Russell Bryant <rbryant@redhat.com>
Date:   Fri Jun 1 14:42:32 2012 -0400

    Use openstack.common.cfg.CONF.
    
    Part of blueprint common-rpc.
    
    This patch makes the rpc code use the global config object from
    openstack-common.  Based on some recent discussions on the mailing list,
    this may not be the final way configuration handling is done here, but
    it is certainly better than the register_opts() hack that is removed by
    this patch.
    
    Change-Id: Id128126e0bc064a2a1c710c6bd32fb3d137dc7f6

 bin/cinder-manage                  |    1 -
 bin/clear_rabbit_queues            |    1 -
 cinder/rpc/__init__.py             |   27 ++++++++++-----------------
 cinder/rpc/impl_fake.py            |    4 ----
 cinder/rpc/impl_kombu.py           |    6 ++----
 cinder/rpc/impl_qpid.py            |    6 ++----
 cinder/service.py                  |    2 --
 cinder/tests/__init__.py           |    3 ---
 cinder/tests/rpc/test_kombu.py     |    1 -
 cinder/tests/rpc/test_kombu_ssl.py |    1 -
 cinder/tests/rpc/test_qpid.py      |    1 -
 11 files changed, 14 insertions(+), 39 deletions(-)

commit 8f1d99d6942538622c737b791007cecdf9248d8a
Author: Russell Bryant <rbryant@redhat.com>
Date:   Sat May 26 20:42:09 2012 -0400

    Remove cinder.log usage from cinder.rpc.
    
    Part of blueprint common-rpc.
    
    This patch removes the usage of cinder.log from cinder.rpc.  This is
    necessary before cinder.rpc can be moved to openstack-common.  The rpc
    logging was not using any of the extra features provided in cinder.log as
    far as I can tell, so the changes are very simple.
    
    This is the final dependency.  After this change, the rpc code
    can be moved to openstack-common without any changes.
    
    Change-Id: I17ca4b691bb8d4f18e618632a2381dd12d31852a

 cinder/rpc/amqp.py      |    2 +-
 cinder/rpc/common.py    |    2 +-
 cinder/rpc/impl_qpid.py |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

commit d916746ae9f656f6feda9d806c1ea45853e2efa3
Author: Russell Bryant <rbryant@redhat.com>
Date:   Fri May 25 16:24:03 2012 -0400

    Remove cinder.context dependency from cinder.rpc
    
    Part of blueprint common-rpc.
    
    This patch removes the usage of cinder.context from cinder.rpc.  Everything
    needed to implement RpcContext now exists within cinder.rpc.
    
    Change-Id: I9e6ec0d22e55d3d4f38e12e0fdd2df745da496f5

 cinder/rpc/amqp.py      |    7 +++----
 cinder/rpc/common.py    |   45 +++++++++++++++++++++++++++++++++++++++++++++
 cinder/rpc/impl_fake.py |    7 +++----
 3 files changed, 51 insertions(+), 8 deletions(-)

commit 2daf95464f18e57edd0409413142f18b11a7745b
Author: Russell Bryant <rbryant@redhat.com>
Date:   Fri May 25 14:13:34 2012 -0400

    Localize rpc options to rpc code.
    
    Part of blueprint common-rpc.
    
    Move rpc options from cinder.flags into cinder.rpc code.  This is necessary
    before the rpc code can be moved to openstack-common.
    
    Change-Id: I474c3660e1cbd3ab663571b1e088c84deb905e0b

 cinder/flags.py                       |   38 ---------------------------------
 cinder/rpc/__init__.py                |    6 ++++++
 cinder/rpc/impl_kombu.py              |   33 ++++++++++++++++++++++++++++
 cinder/scheduler/rpcapi.py            |   33 ----------------------------
 cinder/tests/scheduler/test_rpcapi.py |   34 -----------------------------
 5 files changed, 39 insertions(+), 105 deletions(-)

commit 863b6afe12fb409f4866299bb7c975db7c2ad72e
Author: Russell Bryant <rbryant@redhat.com>
Date:   Wed May 16 16:40:05 2012 -0400

    Add version to scheduler rpc API.
    
    Part of blueprint versioned-rpc-apis.
    
    One side effect of this change was that cinder.scheduler.api was removed
    in favor of cinder.scheduler.rpcapi.  In this case, the api was just a
    direct wrapper around rpc usage.  For other APIs, I've been following
    the pattern that the rpcapi module provides the rpc client wrapper, and
    if any other client-side logic is needed, that's where an api module is
    used.
    
    Change-Id: Ibd0292936f9afc77aeb5d040660bfa857861eed1

 cinder/manager.py                     |    7 ++-
 cinder/scheduler/api.py               |   72 -----------------------
 cinder/scheduler/manager.py           |    5 ++
 cinder/scheduler/rpcapi.py            |   79 +++++++++++++++++++++++++
 cinder/tests/scheduler/test_rpcapi.py |  103 +++++++++++++++++++++++++++++++++
 cinder/tests/test_quota.py            |    2 +-
 6 files changed, 192 insertions(+), 76 deletions(-)

commit ec6e9e4fde537eedb25946734b07297ba6c63c94
Author: Russell Bryant <rbryant@redhat.com>
Date:   Mon Jul 16 21:24:02 2012 +0100

    Sync cfg and iniparser from openstack-common.
    
    Cherry picks af387b9, cb6bf34 and c6c29ab from Nova.
    
    This change pulls in the latest version of the cfg module from
    openstack-common includes some formatting changes, spelling fixes,
    support for bol/eol spaces in values and support for deprecated
    options.
    
    Change-Id: I58c7b2100b594f5f261c089d674f449a1a7d067b

 cinder/openstack/common/cfg.py       |  108 +++++++++++++++++++++++-----------
 cinder/openstack/common/iniparser.py |    5 +-
 2 files changed, 77 insertions(+), 36 deletions(-)

commit e435bca7181240b3a4e4a9a81a21266ba9a6f3e7
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Jul 16 21:19:55 2012 +0100

    Use cfg's new global CONF object
    
    Cherry picks 00786bc from Nova.
    
    Implements blueprint cfg-global-object
    
    Replace cinder.flags.FLAGS with openstack.common.cfg.CONF.
    
    In future, we can do a s/FLAGS/CONF/ across the codebase.
    
    Change-Id: If213a4a5da1faf96aac82f34b18d1e0b061495c0

 bin/cinder-all                 |    3 +-
 bin/cinder-api                 |    3 +-
 bin/cinder-manage              |   31 +++--
 bin/cinder-scheduler           |    3 +-
 bin/cinder-volume              |    4 +-
 bin/clear_rabbit_queues        |    4 +-
 cinder/flags.py                |   17 +--
 cinder/openstack/common/cfg.py |  246 ++++++++++++++++++++++++++--------------
 cinder/test.py                 |    1 +
 cinder/tests/test_flags.py     |   67 ++++-------
 cinder/utils.py                |   21 ----
 11 files changed, 211 insertions(+), 189 deletions(-)

commit 64306e87b38483c00e5055f246294f081e1f0a5b
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue Jul 17 05:10:29 2012 +0100

    Make use of openstack.common.jsonutils.
    
    This patch imports jsonutils from openstack-common.  It removes the
    equivalent code from cinder.utils and then converts the code base to use
    jsonutils.  The primary motivator for this change was to remove the rest
    of the dependencies from cinder.rpc on cinder.utils.
    
    Change-Id: I4b16577f774194a628bf84d5352e63ec1f868698

 cinder/api/openstack/wsgi.py         |    8 +-
 cinder/notifier/api.py               |    3 +-
 cinder/openstack/common/jsonutils.py |  146 ++++++++++++++++++++++++++++++++++
 cinder/rpc/common.py                 |    6 +-
 cinder/tests/test_utils.py           |   87 --------------------
 cinder/utils.py                      |  100 -----------------------
 openstack-common.conf                |    2 +-
 7 files changed, 156 insertions(+), 196 deletions(-)

commit d211eba148f2ec401dadd62114b9a2ea2c95f11a
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Jul 16 21:00:15 2012 +0100

    Sync with latest version of openstack.common.cfg
    
    Cherry picks c1bf456 from Nova.
    
    Changes since last sync:
    
     - Alphabetize imports in openstack/common/cfg.py
     - make reset() clear defaults and overrides
     - automatically create option groups
     - allow options to be marked as required
     - use a list comprehension instead of map()
    
    Change-Id: Ie17fe855a75b5021b031902aa86031d8ddc06dfd
    Reviewed-on: https://review.openstack.org/9867
    Approved: James E. Blair <jeblair@hp.com>
    Reviewed-by: James E. Blair <jeblair@hp.com>
    Tested-by: James E. Blair <jeblair@hp.com>

 cinder/openstack/common/cfg.py |  103 +++++++++++++++++++++++++++++++++-------
 cinder/tests/test_flags.py     |    5 +-
 2 files changed, 90 insertions(+), 18 deletions(-)

commit 2f7feffc64ac435846fb9ee6c467ce128f66b20d
Author: Zhiteng Huang <zhiteng.huang@intel.com>
Date:   Tue Jul 17 15:11:26 2012 +0800

    Convert Cinder to use openstack-common jsonutils.
    
    This patch replaces json handling code in Cinder with openstack-common
    jsonutils.  Also remove some unused imports.
    
    Implement blueprint cinder-common-jsonutils
    
    Change-Id: I28c1a095823c2f04f30c32724144297a2d67fba4
    Reviewed-on: https://review.openstack.org/9912
    Reviewed-by: Mark McLoughlin <markmc@redhat.com>
    Reviewed-by: Vish Ishaya <vishvananda@gmail.com>
    Approved: John Griffith <john.griffith@solidfire.com>
    Tested-by: Jenkins

 cinder/common/policy.py                            |    9 +++++----
 cinder/log.py                                      |    4 ++--
 cinder/notifier/log_notifier.py                    |    4 ++--
 cinder/tests/api/openstack/common.py               |   18 ------------------
 cinder/tests/api/openstack/test_faults.py          |    6 +++---
 .../contrib/test_extended_snapshot_attributes.py   |    8 ++++----
 .../volume/contrib/test_volume_actions.py          |   17 ++++++-----------
 .../tests/api/openstack/volume/test_extensions.py  |    8 ++++----
 cinder/tests/integrated/api/client.py              |    8 ++++----
 cinder/tests/test_log.py                           |    7 +++----
 cinder/volume/nexenta/jsonrpc.py                   |    6 +++---
 cinder/volume/san.py                               |    6 +++---
 12 files changed, 39 insertions(+), 62 deletions(-)

commit a5d16cfb8d6d953d2a9689ddc855cade604e1e9b
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue Jun 12 17:07:18 2012 -0400

    Add missing ack to impl_qpid.
    
    Fix bug 1012374.
    
    Johannes Erdfelt pointed out that impl_qpid wasn't acking messages that
    it received.  This turned out to be a nasty oversight, resulting in
    unbounded message queue growth inside of the python-qpid library.  This
    fixes it.
    
    Change-Id: I0370293807f0282e1dbdd59246f70be031e888a9
    Reviewed-on: https://review.openstack.org/9908
    Reviewed-by: Vish Ishaya <vishvananda@gmail.com>
    Approved: John Griffith <john.griffith@solidfire.com>
    Tested-by: Jenkins

 cinder/rpc/impl_qpid.py       |    7 ++++++-
 cinder/tests/rpc/test_qpid.py |    4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

commit 22a9da3cc4b0cc17d8d3483b95dc57ed43bf0ecb
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 29 16:35:35 2012 -0400

    Move queue_get_for() from db to rpc.
    
    Part of blueprint common-rpc.
    
    The function queue_get_for() is a utility function used by various
    consumers of the rpc API.  This function lived in the db API, but never
    ended up using anything from the database.  This patch moves it into the
    rpc API so that it can be used by other users of rpc once it moves into
    openstack-common.
    
    Change-Id: If92675beecff5471b416a929c161b810e3c71939
    Reviewed-on: https://review.openstack.org/9906
    Reviewed-by: Vish Ishaya <vishvananda@gmail.com>
    Approved: John Griffith <john.griffith@solidfire.com>
    Tested-by: Jenkins

 bin/cinder-manage                        |    4 ++--
 cinder/db/api.py                         |    8 --------
 cinder/db/sqlalchemy/api.py              |    8 --------
 cinder/rpc/__init__.py                   |    5 +++++
 cinder/scheduler/driver.py               |   12 ++++++------
 cinder/tests/scheduler/test_scheduler.py |   16 ++++++++--------
 cinder/volume/api.py                     |   16 ++++++++--------
 7 files changed, 29 insertions(+), 40 deletions(-)

commit 14a30e0b829a24e21d9c547d2e3fd773b1eab675
Author: Russell Bryant <rbryant@redhat.com>
Date:   Mon May 7 14:10:29 2012 -0400

    Add base support for rpc API versioning.
    
    Part of blueprint versioned-rpc-apis.
    
    This commit includes the base support for versioned RPC APIs.  It
    introduces the RpcProxy and RpcDispatcher classes that have common code
    for handling versioning on the client and server sides, respectively.
    
    RPC APIs will be converted one at a time using this infrastructure.
    
    Change-Id: I07bd82e9ff60c356123950e466caaffdfce79eba
    Reviewed-on: https://review.openstack.org/9901
    Reviewed-by: Huang Zhiteng <zhiteng.huang@intel.com>
    Reviewed-by: Vish Ishaya <vishvananda@gmail.com>
    Approved: John Griffith <john.griffith@solidfire.com>
    Tested-by: Jenkins

 cinder/manager.py                   |   12 +++
 cinder/rpc/__init__.py              |    8 ++
 cinder/rpc/amqp.py                  |   19 +++--
 cinder/rpc/common.py                |    5 ++
 cinder/rpc/dispatcher.py            |  105 +++++++++++++++++++++++
 cinder/rpc/impl_fake.py             |    9 +-
 cinder/rpc/proxy.py                 |  161 +++++++++++++++++++++++++++++++++++
 cinder/service.py                   |    8 +-
 cinder/tests/rpc/common.py          |   10 ++-
 cinder/tests/rpc/test_dispatcher.py |  109 ++++++++++++++++++++++++
 cinder/tests/rpc/test_proxy.py      |  124 +++++++++++++++++++++++++++
 11 files changed, 550 insertions(+), 20 deletions(-)

commit c044d3c1f6541b4f7d504e9375eb13efdd36e5a2
Author: Russell Bryant <rbryant@redhat.com>
Date:   Wed May 2 12:14:56 2012 -0400

    Make kombu support optional for running unit tests.
    
    Fix bug 838386.
    
    Previously, the unit tests required kombu to be installed to run.  This
    patch makes it so the unit tests will still complete successfully, even
    if kombu is not installed.
    
    Change-Id: I06831a37f8c857bbfd0bce1b1c3aeda7d341a589
    Reviewed-on: https://review.openstack.org/9900
    Reviewed-by: Vish Ishaya <vishvananda@gmail.com>
    Approved: John Griffith <john.griffith@solidfire.com>
    Tested-by: Jenkins

 cinder/tests/rpc/common.py         |   41 ++++++++++++++++++++++++++++++------
 cinder/tests/rpc/test_kombu.py     |   30 ++++++++++++++++++++++----
 cinder/tests/rpc/test_kombu_ssl.py |   23 ++++++++++++++------
 3 files changed, 77 insertions(+), 17 deletions(-)

commit 9e4242c3865da976928ecd43ef82030ac8bfc8cf
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue May 15 14:43:18 2012 -0400

    Stop using cinder.exception from cinder.rpc.
    
    This patch is a part of continuing to remove dependencies from cinder.rpc
    on the rest of cinder.  One RPC related exception was defined in
    cinder.exception, so that was moved to cinder.rpc.common where the rest of
    them live.  These exceptions were changed to no longer use CinderException
    as their base.  Instead, there is a new RPCException base.
    
    One other change that should be reviewed closely is the removal of using
    cinder.exception.wrap_exception() in cinder.rpc.amqp.  As far as I can tell,
    this didn't actually do anything since nothing was being passed in to
    wrap_exception().
    
    Change-Id: I36ff7c05ab0467ad8506b56d561c532eadf8dff8
    Reviewed-on: https://review.openstack.org/9899
    Reviewed-by: Vish Ishaya <vishvananda@gmail.com>
    Approved: John Griffith <john.griffith@solidfire.com>
    Tested-by: Jenkins

 cinder/exception.py  |    4 ----
 cinder/rpc/amqp.py   |    4 +---
 cinder/rpc/common.py |   31 ++++++++++++++++++++++++++++---
 3 files changed, 29 insertions(+), 10 deletions(-)

commit 4ab214a35ff84f12d09713737aac801fb0256282
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Jul 17 04:28:02 2012 +0100

    Remove unused synchronization decorator
    
    This is only used on the compute and network side in Nova.
    
    Change-Id: I6211c32f585b1b5ff66d1a7a5f65dd25857d76f0
    Reviewed-on: https://review.openstack.org/9888
    Reviewed-by: Vish Ishaya <vishvananda@gmail.com>
    Approved: John Griffith <john.griffith@solidfire.com>
    Tested-by: Jenkins

 cinder/flags.py               |    3 -
 cinder/service.py             |    2 -
 cinder/tests/test_misc.py     |   90 -------------------
 cinder/tests/test_utils.py    |  189 ----------------------------------------
 cinder/utils.py               |  193 -----------------------------------------
 etc/cinder/cinder.conf.sample |    7 --
 tools/clean_file_locks.py     |   63 --------------
 7 files changed, 547 deletions(-)

commit 362576f268e87cb53eb5c5f3dbb46b1768d73dae
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Jul 16 21:30:15 2012 +0100

    Remove 'cinder-manage config convert'
    
    This convers the old flagfile style config files into the the
    new .ini style config files. Since Cinder is new and it's first
    release will only support .ini style files there's no need for
    such a command.
    
    Change-Id: Ie2f4cd8b6f5fc66547a59d39aa3d5eb896b1ddf4
    Reviewed-on: https://review.openstack.org/9871
    Reviewed-by: Huang Zhiteng <zhiteng.huang@intel.com>
    Reviewed-by: Vish Ishaya <vishvananda@gmail.com>
    Approved: John Griffith <john.griffith@solidfire.com>
    Tested-by: Jenkins

 bin/cinder-manage                    |   18 ----
 cinder/compat/__init__.py            |   15 ---
 cinder/compat/flagfile.py            |  188 ----------------------------------
 cinder/tests/test_compat_flagfile.py |  175 -------------------------------
 4 files changed, 396 deletions(-)

commit f07d38bca4ca26edb6f68d4183656b2e87a6c7fc
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Jul 16 21:10:17 2012 +0100

    Use cfg's new behavior of reset() clearing overrides
    
    Cherry-picks b858108 from Nova.
    
    Change-Id: I5e14dea25afd5bff03a39671b2d3b85481977bec
    Reviewed-on: https://review.openstack.org/9868
    Reviewed-by: Huang Zhiteng <zhiteng.huang@intel.com>
    Reviewed-by: Vish Ishaya <vishvananda@gmail.com>
    Approved: John Griffith <john.griffith@solidfire.com>
    Tested-by: Jenkins

 cinder/test.py             |   18 +++++-------------
 cinder/tests/__init__.py   |    1 +
 cinder/tests/fake_flags.py |   23 +++++++++++++----------
 cinder/tests/test_flags.py |    2 +-
 4 files changed, 20 insertions(+), 24 deletions(-)

commit ee669789feabf245fe08f88d55e975c66c4789d7
Merge: c4d7c06 da97aa4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 19 08:11:23 2012 +0000

    Merge changes Id5a0ffab,If283dd7c,I1a11e8fd
    
    * changes:
      Remove old flagfile support
      Misused and not used config options
      Pass 'cinder' project into ConfigOpts

commit c4d7c06a5996e74976be9d3ad6f2902fcf0edd39
Merge: cba4583 519bd24
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 18 17:32:54 2012 +0000

    Merge "Convert Cinder to use openstack-common timeutils"

commit ed7e05b00861e1fa3fbc21c4562a17b97d1f16f9
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Jul 17 04:35:28 2012 +0100

    Remove unused enabled_apis flag
    
    This is only useful in the context of Nova where there are multiple
    APIs.
    
    Change-Id: I2339a36b45166a24825882e3e35dd00a2dfb6b27

 bin/cinder-all                |    9 ++++-----
 cinder/flags.py               |    3 ---
 etc/cinder/cinder.conf.sample |    2 --
 3 files changed, 4 insertions(+), 10 deletions(-)

commit 8b6397bbf58a6c0da00500407790ed8547741771
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Jul 17 04:33:17 2012 +0100

    Remove some unused helper scripts
    
    openstack-config init script and clean-vlans scripts are only relevant
    to nova.
    
    Change-Id: Ib139cae1e0f157f69f7d9ae7186c555538e4b1f5

 contrib/openstack-config |   65 ----------------------------------------------
 tools/clean-vlans        |   25 ------------------
 2 files changed, 90 deletions(-)

commit c73d15d347ba5a973e257932ffb9d6012939e3a5
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Jul 17 04:18:40 2012 +0100

    Remove unused wrap_errors decorator
    
    Only used by rescue extension in nova.
    
    Change-Id: I3ade99405736bf8ffb8891a8d53c02905501ae44

 cinder/api/openstack/extensions.py |   12 ------------
 1 file changed, 12 deletions(-)

commit 23df2650371345f05f75208a9e35d7ca0b6421e4
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Jul 17 04:10:18 2012 +0100

    Remove unused get_{id,version}_from_href()
    
    The former is only used in the compute API in Nova to e.g. get
    an image or flavor ID from a client supplied ref.
    
    The latter is unused even in Nova since the removal of the 1.0
    API.
    
    Change-Id: I4e00ca816820cb51c0ab3d4d864766d981854939

 cinder/api/openstack/common.py            |   33 ------------------
 cinder/tests/api/openstack/test_common.py |   54 -----------------------------
 2 files changed, 87 deletions(-)

commit b79ad1a950116b6eb0e0f7be48e9ca215681ee1e
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Jul 17 04:06:19 2012 +0100

    Remove unused metadata serialization
    
    Only used by the compute API in Nova for e.g. images and server
    metadata.
    
    Change-Id: I223aca1a1c8e35c9339107e5c11bdd8a39968681

 cinder/api/openstack/common.py            |   72 -----------
 cinder/api/openstack/wsgi.py              |   12 --
 cinder/tests/api/openstack/test_common.py |  197 -----------------------------
 3 files changed, 281 deletions(-)

commit 03700f12f356a00c67fe3c301cc297c85e92c69e
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Jul 17 04:04:58 2012 +0100

    Remove unused raise_http_conflict_for_instance_invalid_state()
    
    Only used by the compute API in Nova.
    
    Change-Id: I3b2dfa33b4bd1523e13ddb5401bc0397df7466ef

 cinder/api/openstack/common.py            |   15 ---------------
 cinder/tests/api/openstack/test_common.py |   28 ----------------------------
 2 files changed, 43 deletions(-)

commit fbf1ee2069450eb6b55d18fafea6aa44874219c9
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Jul 17 04:00:51 2012 +0100

    Remove unused OverLimitFault
    
    Only used by compute limits in Nova.
    
    Change-Id: I065ca64e060acc0773189f1497fcc54041621f39

 cinder/api/openstack/wsgi.py |   47 ------------------------------------------
 1 file changed, 47 deletions(-)

commit da97aa46d8210abf848520c06a29638f925c42ed
Author: Ghe Rivero <ghe@debian.org>
Date:   Mon Jul 16 20:31:51 2012 +0100

    Remove old flagfile support
    
    Cherry-picks 7e3e9b8 from Nova.
    
    Change-Id: Id5a0ffabf7c6eab0bbda1b130a39a6581b26e350

 Authors                    |    1 +
 bin/cinder-all             |    2 +-
 bin/cinder-api             |    2 +-
 bin/cinder-manage          |    8 ++++----
 bin/cinder-scheduler       |    2 +-
 bin/cinder-volume          |    2 +-
 bin/clear_rabbit_queues    |    2 +-
 cinder/flags.py            |    4 +---
 cinder/tests/test_flags.py |   32 --------------------------------
 cinder/utils.py            |   10 +++++-----
 10 files changed, 16 insertions(+), 49 deletions(-)

commit 78918b8861f11d0145f8cc7310ece6ec8535c6e5
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Mon Jul 16 20:37:54 2012 +0100

    Misused and not used config options
    
    Cherry picks dc9c3cb from Nova.
    
    Fixes bug #1000071
    
    [nova.api.sizelimit.py]
    osapi_max_request_body_size: BoolOpt -> IntOpt
    
    [nova.rpc.__init__.py]
    allowed_rpc_exception_modules: IntOpt -> ListOpt
    
    [nova.volume.driver.py]
    num_shell_tries: StrOpt -> IntOpt
    num_iscsi_scan_tries: StrOpt -> IntOpt
    
    [nova.volume.driver.py]
    san_thin_provision: 'true' -> True
    san_is_local: 'false' -> False
    
    Change-Id: If283dd7c4feba69c07bd483acd14f45c2659b743

 cinder/api/sizelimit.py |    6 +++---
 cinder/rpc/__init__.py  |    2 +-
 cinder/volume/driver.py |    4 ++--
 cinder/volume/san.py    |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

commit 9929f2b2a152f34e24366f5f0afbc071ff40833f
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Jul 16 20:33:45 2012 +0100

    Pass 'cinder' project into ConfigOpts
    
    Cherry-picks fb96f7d from Nova.
    
    Change-Id: I1a11e8fd6a56b2336457f7df178c2b3c187246c3

 cinder/flags.py |    2 ++
 1 file changed, 2 insertions(+)

commit cba45833120ef03fb355f0c8399cd62fc80ef2ac
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Jul 16 20:48:02 2012 +0100

    Sync to newer openstack.common.cfg
    
    Cherry picks e0d891e from Nova.
    
    Changes since last sync are:
    
     * New ConfigOpts.find_file() for locating conf files
     * Support for directory source of config files
     * Provide file extension when when looking for files
     * Some refactoring of the cfg cache
     * Add caching to openstack.common.cfg
    
    Change-Id: If9852d0431093d590252bb704e934a4a56ef0263

 cinder/openstack/common/cfg.py |  206 +++++++++++++++++++++++++++++++---------
 1 file changed, 163 insertions(+), 43 deletions(-)

commit 519bd2451d8b3aff6661d18e340b8f31a69e1091
Author: Zhiteng Huang <zhiteng.huang@intel.com>
Date:   Fri Jul 13 13:58:25 2012 +0800

    Convert Cinder to use openstack-common timeutils
    
    This patch is part of effort to get Cinder to use openstack-common
    package.  This part is to replace time related functions in utils.py
    with 'timeutils' module.
    
    Implement blueprint cinder-common-timeutils
    
    Change-Id: Ic5e9e317a95a7399f0604823eec76b3642a0c1b1

 bin/cinder-manage                        |    1 -
 cinder/common/memorycache.py             |    5 +-
 cinder/context.py                        |    7 +-
 cinder/db/sqlalchemy/api.py              |   16 ++--
 cinder/db/sqlalchemy/models.py           |    7 +-
 cinder/notifier/api.py                   |    5 +-
 cinder/scheduler/driver.py               |    3 +-
 cinder/test.py                           |    3 +-
 cinder/tests/api/openstack/fakes.py      |    3 +-
 cinder/tests/scheduler/test_scheduler.py |    5 +-
 cinder/tests/test_utils.py               |  118 ++----------------------------
 cinder/utils.py                          |   82 +--------------------
 cinder/volume/api.py                     |    3 +-
 cinder/volume/manager.py                 |    3 +-
 14 files changed, 45 insertions(+), 216 deletions(-)

commit 008cad14287e17e7bc9ea434b12715c011de880d
Merge: c3bc1aa c7690fc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 12 20:03:42 2012 +0000

    Merge "Updated HpSanISCSIDriver to use initialize/terminate methods."

commit c3bc1aa3a60432152d2f44d3963c451ed483ef79
Author: John Griffith <john.griffith@solidfire.com>
Date:   Thu Jul 12 09:01:14 2012 -0600

    Do not duplicate nova docs in cinder
    
    * This modifies the index.rst file to give interim info about cinder
    * We were regenerating the nova docs copied over which was bad!
    * Fixes bug 1022315
    
    Change-Id: I46531976f3e6521cec69cc13276d328d6c2d2da3

 doc/source/index.rst |   36 +++---------------------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

commit b46a0afc37ce2f93bcf3527593eec1097792cae5
Author: John Griffith <john.griffith@solidfire.com>
Date:   Fri Jul 6 18:28:53 2012 -0600

    Remove unused db api methods
    
      * Implements cinder blueprint remove-extra-dbapi-methods
      * Related to cinder initial-db-cleanup:
          Remove db api methods associated with removed tables
    	  Modify/Remove tests associated with removed tables
    	  Remove non-existing db API calls from volume/api
    
    Change-Id: I60e0c6ffad9c78a29d56a27a04e9ec5ebaa1f251

 cinder/db/api.py                                |  938 +++--------------------
 cinder/db/sqlalchemy/api.py                     |  515 ++++---------
 cinder/openstack/common/timeutils.py            |  109 +++
 cinder/tests/notifier/test_capacity_notifier.py |   59 --
 openstack-common.conf                           |    2 +-
 5 files changed, 393 insertions(+), 1230 deletions(-)

commit 263d7b905446e8eaadbcc0501846da7d771e57ad
Author: John Griffith <john.griffith@solidfire.com>
Date:   Tue Jul 3 16:40:15 2012 -0600

    Create single initial Cinder DB migration file
    
     * Implements blueprint initial-db-cleanup
     * Sets initial migration
     * Removes unused tables that were brought in from nova
     * Condenses db migrations into the single initial migration/creation
     * Add explicit mysql set InnoDB in UTF8 loop
     * Folow up patches include:
     *    Remove unused db API calls
     *    Fix/Remove affected tests
    
    Change-Id: If24b00747dbbff7037b7aca39602d5f0b1c6aa50

 cinder/db/migration.py                             |    3 +
 .../sqlalchemy/migrate_repo/versions/001_austin.py |  627 ----------------
 .../migrate_repo/versions/001_cinder_init.py       |  272 +++++++
 .../sqlalchemy/migrate_repo/versions/002_bexar.py  |  236 ------
 .../versions/002_postgresql_downgrade.sql          |   20 -
 .../migrate_repo/versions/002_sqlite_downgrade.sql |  388 ----------
 .../versions/003_add_label_to_networks.py          |   42 --
 .../migrate_repo/versions/003_sqlite_downgrade.sql |  111 ---
 .../migrate_repo/versions/004_add_zone_tables.py   |   66 --
 .../versions/005_add_instance_metadata.py          |   81 ---
 .../versions/006_add_provider_data_to_volumes.py   |   54 --
 .../migrate_repo/versions/006_sqlite_downgrade.sql |  113 ---
 .../versions/007_add_ipv6_to_fixed_ips.py          |   70 --
 .../migrate_repo/versions/007_sqlite_downgrade.sql |   79 --
 .../versions/008_add_instance_types.py             |   85 ---
 .../versions/009_add_instance_migrations.py        |   70 --
 .../versions/010_add_os_type_to_instances.py       |   45 --
 .../migrate_repo/versions/011_live_migration.py    |   85 ---
 .../versions/012_add_ipv6_flatmanager.py           |   90 ---
 .../migrate_repo/versions/012_sqlite_upgrade.sql   |  195 -----
 .../versions/013_add_flavors_to_migrations.py      |   43 --
 .../migrate_repo/versions/013_sqlite_downgrade.sql |   69 --
 .../014_add_instance_type_id_to_instances.py       |   74 --
 .../015_add_auto_assign_to_floating_ips.py         |   35 -
 .../migrate_repo/versions/015_sqlite_downgrade.sql |   62 --
 .../versions/016_make_quotas_key_and_value.py      |  213 ------
 .../017_make_instance_type_id_an_integer.py        |   87 ---
 .../versions/018_rename_server_management_url.py   |   35 -
 .../versions/019_add_volume_snapshot_support.py    |   82 ---
 .../versions/020_add_snapshot_id_to_volumes.py     |   40 --
 .../migrate_repo/versions/020_sqlite_downgrade.sql |  119 ---
 .../migrate_repo/versions/021_rename_image_ids.py  |   38 -
 .../versions/022_set_engine_mysql_innodb.py        |   64 --
 .../versions/023_add_vm_mode_to_instances.py       |   42 --
 .../versions/024_add_block_device_mapping.py       |   92 ---
 .../versions/025_add_uuid_to_instances.py          |   45 --
 .../migrate_repo/versions/026_add_agent_table.py   |   89 ---
 .../versions/027_add_provider_firewall_rules.py    |   65 --
 .../versions/028_add_instance_type_extra_specs.py  |   76 --
 .../versions/029_add_zone_weight_offsets.py        |   41 --
 .../migrate_repo/versions/030_multi_nic.py         |  146 ----
 .../migrate_repo/versions/030_sqlite_downgrade.sql |  377 ----------
 .../031_fk_fixed_ips_virtual_interface_id.py       |   59 --
 .../migrate_repo/versions/031_sqlite_downgrade.sql |   48 --
 .../migrate_repo/versions/031_sqlite_upgrade.sql   |   48 --
 .../versions/032_add_root_device_name.py           |   42 --
 .../migrate_repo/versions/033_ha_network.py        |   42 --
 .../migrate_repo/versions/033_sqlite_downgrade.sql |  193 -----
 .../034_change_instance_id_in_migrations.py        |   46 --
 .../migrate_repo/versions/035_secondary_dns.py     |   39 -
 .../versions/036_change_flavor_id_in_migrations.py |   79 --
 .../versions/037_instances_drop_admin_pass.py      |   42 --
 .../versions/038_add_uuid_to_virtual_interfaces.py |   45 --
 .../migrate_repo/versions/038_sqlite_downgrade.sql |   63 --
 .../versions/039_add_instances_accessip.py         |   49 --
 .../versions/040_add_uuid_to_networks.py           |   45 --
 .../versions/041_add_config_drive_to_instances.py  |   36 -
 .../versions/042_add_volume_types_and_extradata.py |  122 ----
 .../migrate_repo/versions/042_sqlite_downgrade.sql |  129 ----
 .../migrate_repo/versions/043_add_vsa_data.py      |   84 ---
 .../versions/044_update_instance_states.py         |   52 --
 .../versions/045_add_network_priority.py           |   44 --
 .../migrate_repo/versions/046_add_instance_swap.py |   49 --
 .../versions/047_remove_instances_fk_from_vif.py   |   61 --
 .../migrate_repo/versions/047_sqlite_downgrade.sql |   46 --
 .../migrate_repo/versions/047_sqlite_upgrade.sql   |   45 --
 .../migrate_repo/versions/048_add_zone_name.py     |   33 -
 .../versions/049_add_instances_progress.py         |   44 --
 .../versions/050_add_disk_config_to_instances.py   |   37 -
 .../migrate_repo/versions/050_sqlite_downgrade.sql |  207 ------
 .../051_add_vcpu_weight_to_instance_types.py       |   34 -
 .../versions/052_kill_export_devices.py            |   65 --
 ..._add_connection_info_to_block_device_mapping.py |   38 -
 .../migrate_repo/versions/053_sqlite_downgrade.sql |   87 ---
 .../versions/054_add_bw_usage_data_cache.py        |   64 --
 .../versions/055_convert_flavor_id_to_str.py       |  112 ---
 .../migrate_repo/versions/056_add_s3_images.py     |   60 --
 .../versions/057_add_sm_driver_tables.py           |  113 ---
 .../versions/058_rename_managed_disk.py            |   37 -
 .../versions/059_split_rxtx_quota_into_network.py  |   61 --
 .../migrate_repo/versions/059_sqlite_downgrade.sql |  137 ----
 .../migrate_repo/versions/059_sqlite_upgrade.sql   |   87 ---
 .../versions/060_remove_network_fk_from_vif.py     |   62 --
 .../migrate_repo/versions/060_sqlite_downgrade.sql |   45 --
 .../migrate_repo/versions/060_sqlite_upgrade.sql   |   44 --
 .../versions/061_add_index_to_instance_uuid.py     |   29 -
 .../versions/062_add_instance_info_cache_table.py  |   70 --
 .../versions/063_add_instance_faults_table.py      |   60 --
 ...ange_instance_id_to_uuid_in_instance_actions.py |   80 ---
 .../065_add_index_to_instance_project_id.py        |   31 -
 .../066_preload_instance_info_cache_table.py       |   31 -
 .../067_add_pool_and_interface_to_floating_ip.py   |   41 --
 .../migrate_repo/versions/067_sqlite_downgrade.sql |   69 --
 .../versions/068_add_instance_attribute.py         |   36 -
 .../migrate_repo/versions/068_sqlite_downgrade.sql |  219 ------
 .../migrate_repo/versions/069_block_migration.py   |   50 --
 .../migrate_repo/versions/070_sqlite_downgrade.sql |  103 ---
 .../migrate_repo/versions/070_sqlite_upgrade.sql   |   99 ---
 .../versions/070_untie_nova_network_models.py      |  100 ---
 .../versions/071_add_host_aggregate_tables.py      |  108 ---
 .../migrate_repo/versions/072_add_dns_table.py     |   77 --
 .../migrate_repo/versions/072_mysql_upgrade.sql    |   13 -
 .../migrate_repo/versions/073_add_capacity.py      |   49 --
 .../versions/074_change_flavor_local_gb.py         |  130 ----
 .../migrate_repo/versions/074_sqlite_upgrade.sql   |  313 --------
 .../075_convert_bw_usage_to_store_network_id.py    |   97 ---
 .../versions/076_remove_unique_constraints.py      |   84 ---
 .../migrate_repo/versions/076_sqlite_upgrade.sql   |   61 --
 .../migrate_repo/versions/077_convert_to_utf8.py   |   61 --
 .../versions/078_add_rpc_info_to_zones.py          |   46 --
 .../migrate_repo/versions/078_sqlite_downgrade.sql |   35 -
 .../versions/079_add_zone_name_to_instances.py     |   30 -
 ...080_add_hypervisor_hostname_to_compute_nodes.py |   30 -
 .../versions/081_drop_instance_id_bw_cache.py      |   69 --
 .../migrate_repo/versions/082_zone_to_cell.py      |   35 -
 .../migrate_repo/versions/083_quota_class.py       |   61 --
 .../migrate_repo/versions/084_quotas_unlimited.py  |   43 --
 .../085_add_index_to_fixed_ips_by_address.py       |   31 -
 .../versions/086_set_engine_mysql_innodb.py        |   44 --
 .../versions/087_add_uuid_to_bw_usage_cache.py     |   56 --
 ..._instance_id_to_uuid_in_block_device_mapping.py |   81 ---
 .../migrate_repo/versions/088_sqlite_downgrade.sql |   97 ---
 .../migrate_repo/versions/088_sqlite_upgrade.sql   |   97 ---
 .../versions/089_add_volume_id_mappings.py         |  116 ---
 .../versions/090_modify_volume_id_datatype.py      |  239 -------
 .../migrate_repo/versions/090_sqlite_downgrade.sql |  226 ------
 .../migrate_repo/versions/090_sqlite_upgrade.sql   |  226 ------
 .../versions/091_convert_volume_ids_to_uuid.py     |  145 ----
 .../versions/092_change_fk_instance_id_to_uuid.py  |   94 ---
 .../migrate_repo/versions/092_sqlite_downgrade.sql |  133 ----
 .../migrate_repo/versions/092_sqlite_upgrade.sql   |  132 ----
 cinder/db/sqlalchemy/migration.py                  |   24 +-
 cinder/db/sqlalchemy/models.py                     |  756 +-------------------
 cinder/tests/test_db_api.py                        |  331 ---------
 cinder/tests/test_migrations.py                    |   17 +-
 135 files changed, 322 insertions(+), 12424 deletions(-)

commit c7690fc53dba8ce7221c5f7afd93238be1ea0498
Author: Zhiteng Huang <zhiteng.huang@intel.com>
Date:   Thu Jul 5 15:08:34 2012 +0800

    Updated HpSanISCSIDriver to use initialize/terminate methods.
    
    This is based on Nirmal Ranganathan's patch for Nova-volume, which
    added a new key 'host' for initialize/terminate volume connection
    information in nova to fix bug 992729.
    
    HpSanISCSIDriver should adopt the change in order to work properly.
    Also added missing unit tests for the HpSanISCSIDriver.
    
    Fixes bug 992729.
    
    Change-Id: I9584811a340799161d8c9ae88b1def282380c9ad
    Signed-off-by: Zhiteng Huang <zhiteng.huang@intel.com>

 Authors                               |    1 +
 cinder/tests/test_HpSanISCSIDriver.py |  212 +++++++++++++++++++++++++++++++++
 cinder/volume/san.py                  |   89 ++++++--------
 3 files changed, 252 insertions(+), 50 deletions(-)

commit a55f0732211f0a1a8f6db40e6d1f464050234844
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Tue Jul 3 17:49:16 2012 -0700

    Pruned Authors file to active contributors (from nova-volumes).
    
    Active contributors was fetched from git blame output, for files
    inside the nova/nova/volumes folder in nova.
    
    Change-Id: I8cc63975bf1160ca76badc54fd4d51077873dfee

 Authors |  172 ++-------------------------------------------------------------
 1 file changed, 5 insertions(+), 167 deletions(-)

commit 57d6c5d1bc914c4dfe36311ec83828c5a85fa7ca
Author: Clark Boylan <clark.boylan@gmail.com>
Date:   Mon Jul 2 14:17:31 2012 -0700

    Move nova-manage.rst to cinder-manage.rst.
    
    Cinder docs were not building because sphinx was looking for
    cinder-manage.rst which did not exist. The file was simply misnamed
    and renaming it to cinder-manage.rst allows the docs to build.
    
    Change-Id: I68f4ed81230cc277a96bb34dfa172e5ce7788ac4

 Authors                          |    1 +
 doc/source/man/cinder-manage.rst |  281 ++++++++++++++++++++++++++++++++++++++
 doc/source/man/nova-manage.rst   |  281 --------------------------------------
 3 files changed, 282 insertions(+), 281 deletions(-)

commit a9c8212f6925b9f4e0feb25621266265968ee1df
Author: John Griffith <john.griffith@solidfire.com>
Date:   Wed Jun 13 12:38:35 2012 -0600

    Add action extensions to support nova integration.
    
     * Adds VolumeActions extension to support key functions
        described in blueprint volume-decoupling
     * Adds snapshot translations to APIs
     * Should be back in sync with 7992
     * blueprint compat-extensions
     * sleepsonthefloor: Moved added snapshot attributes to extension, added tests
     * sleepsonthefloor: Lock pep8==1.1 in tox.ini
    
    Change-Id: I9c6118cd434ca8b275d2386546923f932420b975

 cinder/api/openstack/volume/__init__.py            |    3 +-
 .../volume/contrib/extended_snapshot_attributes.py |  125 +++++++++++++++++++
 .../api/openstack/volume/contrib/volume_actions.py |  114 ++++++++++++++++++
 cinder/api/openstack/volume/snapshots.py           |   23 ++--
 cinder/tests/api/openstack/fakes.py                |   24 ++--
 .../contrib/test_extended_snapshot_attributes.py   |  126 ++++++++++++++++++++
 .../volume/contrib/test_volume_actions.py          |  107 +++++++++++++++++
 .../tests/api/openstack/volume/test_snapshots.py   |   31 ++---
 cinder/tests/policy.json                           |    3 +-
 cinder/volume/manager.py                           |    6 +-
 etc/cinder/policy.json                             |    3 +-
 tox.ini                                            |    2 +-
 12 files changed, 523 insertions(+), 44 deletions(-)

commit 2c6e2732592849016f248434469f5289780e375c
Merge: a071c75 9c55720
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 13 18:23:58 2012 +0000

    Merge "Revert "Add action extensions to support nova integration.""

commit 9c55720129df12780d1d6480942d6d96abf54a01
Author: John Griffith <john.griffith@solidfire.com>
Date:   Wed Jun 13 17:51:37 2012 +0000

    Revert "Add action extensions to support nova integration."
    
    This reverts commit 8d8903f466cd7d4270e46ad896817fe94c99b575

 cinder/api/openstack/volume/__init__.py            |    3 +-
 .../api/openstack/volume/contrib/volume_actions.py |  114 --------------------
 cinder/tests/api/openstack/fakes.py                |   24 ++---
 .../volume/contrib/test_volume_actions.py          |  107 ------------------
 cinder/volume/manager.py                           |    6 +-
 5 files changed, 15 insertions(+), 239 deletions(-)

commit a071c75c7efeaaffa8faab91ead8d7d71b273cb8
Merge: f8c9b20 8d8903f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 12 04:26:40 2012 +0000

    Merge "Add action extensions to support nova integration."

commit f8c9b20b2dd31d8501d26111bde4107df8bb42e7
Author: John Griffith <john.griffith@solidfire.com>
Date:   Thu Jun 7 14:38:29 2012 -0600

    Fix volume['id'] from integer to string
    
    * This is the same fix as nova bug 1010200
    * Missed in volume uuid migration
    
    Change-Id: Ib433ea6a1f247aad7fcba72680fd14e82387ed62

 cinder/volume/driver.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 8d8903f466cd7d4270e46ad896817fe94c99b575
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu May 31 12:03:02 2012 -0700

    Add action extensions to support nova integration.
    
     * Adds VolumeActions extension to support key functions
       described in blueprint volume-decoupling
    
    Change-Id: I1310c9e813c089619e8ecdf56c631d8257c0897e

 cinder/api/openstack/volume/__init__.py            |    3 +-
 .../api/openstack/volume/contrib/volume_actions.py |  114 ++++++++++++++++++++
 cinder/tests/api/openstack/fakes.py                |   24 ++---
 .../volume/contrib/test_volume_actions.py          |  107 ++++++++++++++++++
 cinder/volume/manager.py                           |    6 +-
 5 files changed, 239 insertions(+), 15 deletions(-)

commit 0cd8f34eed28a2c1a77d56fe4b0e00816ef48780
Author: John Griffith <john.griffith@solidfire.com>
Date:   Fri Jun 1 10:46:14 2012 -0600

    Set pep8 version to 1.1 in test_requires
    
    * Fixes bug 1007518
    * Changes in pep8 cause new failures
    * Fix up the ones we found anyway
    
    Change-Id: I5cd73a252f73893e4672a2e39b667c519423ae3f

 .../versions/010_add_os_type_to_instances.py       |    4 ++--
 .../014_add_instance_type_id_to_instances.py       |    8 ++++----
 .../versions/016_make_quotas_key_and_value.py      |    4 ++--
 .../versions/025_add_uuid_to_instances.py          |    4 ++--
 .../migrate_repo/versions/030_multi_nic.py         |    2 +-
 .../versions/036_change_flavor_id_in_migrations.py |   16 ++++++++--------
 .../versions/038_add_uuid_to_virtual_interfaces.py |    4 ++--
 .../versions/040_add_uuid_to_networks.py           |    4 ++--
 .../075_convert_bw_usage_to_store_network_id.py    |    8 ++++----
 .../versions/081_drop_instance_id_bw_cache.py      |    4 ++--
 .../versions/089_add_volume_id_mappings.py         |    2 +-
 tools/hacking.py                                   |    8 ++++----
 tools/test-requires                                |    2 +-
 13 files changed, 35 insertions(+), 35 deletions(-)

commit 2263cf7db7672699e29a76d68dbe91cad2071b86
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed May 30 15:24:41 2012 -0700

    Fix topics so that the do not collide with nova.
    
     * Without this, there are issues running cinder if
       you have previously run n-vol
     * Fix pep8
    
    Change-Id: Id56dbfd6c4f62a74cc57edcc7859753dd7e36229

 cinder/db/sqlalchemy/api.py              |    2 +-
 cinder/flags.py                          |    4 ++--
 cinder/scheduler/driver.py               |    4 ++--
 cinder/service.py                        |    5 +++--
 cinder/tests/scheduler/test_scheduler.py |    9 ++++++---
 cinder/volume/manager.py                 |    2 +-
 6 files changed, 15 insertions(+), 11 deletions(-)

commit 50792c2ff41fdc7e73b3e3c51f4510366debfd14
Author: Monty Taylor <mordred@inaugust.com>
Date:   Mon May 21 14:40:18 2012 -0400

    Fix up coverage and jenkins test running.
    
    The docs job wasn't working because of an un-renamed file.
    Coverage wasn't running in jenkins with the xml output file.
    Remove the .cache.bundle support that we're moving away from.
    
    Change-Id: I1140baa53dee8b14ac4d1f8549425a0fdd7a8425

 doc/ext/cinder_autodoc.py |   12 ++++++
 doc/ext/cinder_todo.py    |  101 +++++++++++++++++++++++++++++++++++++++++++++
 doc/ext/nova_autodoc.py   |   12 ------
 doc/ext/nova_todo.py      |  101 ---------------------------------------------
 run_tests.sh              |    5 +++
 setup.cfg                 |    8 ++--
 tox.ini                   |   14 +++----
 7 files changed, 128 insertions(+), 125 deletions(-)

commit fe23db33801fa72665e480534d070ddae4a9c451
Author: John Griffith <john.griffith@solidfire.com>
Date:   Wed May 9 11:02:34 2012 -0600

    Remove instance Foreign Key in volumes table, replace with instance_uuid
    
    * Remove the instance relationship and instance_id FK
    * Add instance_uuuid column to volumes table
    
    Change-Id: I54d723dcb9819731a58ec64095c54c99aa9e5dc4

 cinder/api/openstack/volume/volumes.py             |   12 +-
 cinder/db/api.py                                   |    9 +-
 cinder/db/sqlalchemy/api.py                        |   46 ++++---
 .../versions/092_change_fk_instance_id_to_uuid.py  |   94 ++++++++++++++
 .../migrate_repo/versions/092_sqlite_downgrade.sql |  133 ++++++++++++++++++++
 .../migrate_repo/versions/092_sqlite_upgrade.sql   |  132 +++++++++++++++++++
 cinder/db/sqlalchemy/models.py                     |   16 +--
 cinder/exception.py                                |    4 +
 cinder/tests/api/openstack/fakes.py                |    6 +-
 cinder/tests/api/openstack/volume/test_volumes.py  |    4 +-
 cinder/tests/test_migrations.py                    |   14 ++-
 cinder/tests/test_volume.py                        |   30 ++---
 cinder/volume/api.py                               |    4 +-
 cinder/volume/manager.py                           |   12 +-
 etc/cinder/cinder.conf.sample                      |    2 +-
 15 files changed, 436 insertions(+), 82 deletions(-)

commit 1c52fb3041df5661756246705942c60b4b1448d5
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu May 3 21:45:20 2012 -0700

    Align the tox.ini file.
    
    Change-Id: I0d1731f157d12bfcc1e4933dd71c49e9bda4116a

 tox.ini |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

commit 4c202523890d805c8e42802117d85d6f6e2cddae
Author: Nirmal Ranganathan <rnirmal@gmail.com>
Date:   Thu May 3 14:54:27 2012 -0500

    Removed cinder/api/openstack/compute and moved the relevant pieces under
    cinder/api/openstack/volume. Fixes bug 994177.
    
    Change-Id: I1b953a96a1d69a62ad312d381cead4cd231a3998

 cinder/api/openstack/compute/__init__.py           |   23 --
 cinder/api/openstack/compute/schemas/atom-link.rng |  141 -----------
 .../openstack/compute/schemas/v1.1/extension.rng   |   11 -
 .../openstack/compute/schemas/v1.1/extensions.rng  |    6 -
 .../openstack/compute/schemas/v1.1/metadata.rng    |    9 -
 cinder/api/openstack/compute/versions.py           |  244 --------------------
 cinder/api/openstack/compute/views/versions.py     |   94 --------
 cinder/api/openstack/volume/schemas/atom-link.rng  |  141 +++++++++++
 .../openstack/volume/schemas/v1.1/extension.rng    |   11 +
 .../openstack/volume/schemas/v1.1/extensions.rng   |    6 +
 .../api/openstack/volume/schemas/v1.1/metadata.rng |    9 +
 cinder/api/openstack/volume/versions.py            |  169 +++++++++++++-
 cinder/api/openstack/volume/views/versions.py      |   63 ++++-
 cinder/api/openstack/xmlutil.py                    |    4 +-
 cinder/tests/api/openstack/fakes.py                |    2 +-
 15 files changed, 392 insertions(+), 541 deletions(-)

commit c53d8e343e50d4cf7ea9a6a81258848c2d893bfb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 3 10:48:26 2012 -0700

    Initial fork out of Nova.

 .gitignore                                         |   24 +
 .gitreview                                         |    4 +
 .mailmap                                           |   81 +
 Authors                                            |  211 +
 HACKING.rst                                        |  213 +
 LICENSE                                            |  176 +
 MANIFEST.in                                        |   37 +
 README.rst                                         |   21 +
 babel.cfg                                          |    2 +
 bin/cinder-all                                     |   70 +
 bin/cinder-api                                     |   47 +
 bin/cinder-manage                                  |  635 +
 bin/cinder-rootwrap                                |   74 +
 bin/cinder-scheduler                               |   51 +
 bin/cinder-volume                                  |   49 +
 bin/clear_rabbit_queues                            |   80 +
 cinder/__init__.py                                 |   42 +
 cinder/api/__init__.py                             |   17 +
 cinder/api/auth.py                                 |  103 +
 cinder/api/openstack/__init__.py                   |  143 +
 cinder/api/openstack/auth.py                       |   65 +
 cinder/api/openstack/common.py                     |  380 +
 cinder/api/openstack/compute/__init__.py           |   23 +
 cinder/api/openstack/compute/schemas/atom-link.rng |  141 +
 .../openstack/compute/schemas/v1.1/extension.rng   |   11 +
 .../openstack/compute/schemas/v1.1/extensions.rng  |    6 +
 .../openstack/compute/schemas/v1.1/metadata.rng    |    9 +
 cinder/api/openstack/compute/versions.py           |  244 +
 cinder/api/openstack/compute/views/versions.py     |   94 +
 cinder/api/openstack/extensions.py                 |  395 +
 cinder/api/openstack/urlmap.py                     |  297 +
 cinder/api/openstack/volume/__init__.py            |   62 +
 cinder/api/openstack/volume/contrib/__init__.py    |   39 +
 .../openstack/volume/contrib/types_extra_specs.py  |  152 +
 .../api/openstack/volume/contrib/types_manage.py   |   91 +
 cinder/api/openstack/volume/extensions.py          |   33 +
 cinder/api/openstack/volume/snapshots.py           |  170 +
 cinder/api/openstack/volume/types.py               |   76 +
 cinder/api/openstack/volume/versions.py            |   83 +
 cinder/api/openstack/volume/views/__init__.py      |   16 +
 cinder/api/openstack/volume/views/versions.py      |   36 +
 cinder/api/openstack/volume/volumes.py             |  263 +
 cinder/api/openstack/wsgi.py                       | 1123 ++
 cinder/api/openstack/xmlutil.py                    |  908 ++
 cinder/api/sizelimit.py                            |   54 +
 cinder/common/__init__.py                          |   15 +
 cinder/common/memorycache.py                       |   64 +
 cinder/common/policy.py                            |  222 +
 cinder/compat/__init__.py                          |   15 +
 cinder/compat/flagfile.py                          |  188 +
 cinder/compute/aggregate_states.py                 |   44 +
 cinder/context.py                                  |  138 +
 cinder/db/__init__.py                              |   23 +
 cinder/db/api.py                                   | 1335 ++
 cinder/db/base.py                                  |   40 +
 cinder/db/migration.py                             |   35 +
 cinder/db/sqlalchemy/__init__.py                   |   17 +
 cinder/db/sqlalchemy/api.py                        | 1499 ++
 cinder/db/sqlalchemy/migrate_repo/README           |    4 +
 cinder/db/sqlalchemy/migrate_repo/manage.py        |    4 +
 cinder/db/sqlalchemy/migrate_repo/migrate.cfg      |   20 +
 .../sqlalchemy/migrate_repo/versions/001_austin.py |  627 +
 .../sqlalchemy/migrate_repo/versions/002_bexar.py  |  236 +
 .../versions/002_postgresql_downgrade.sql          |   20 +
 .../migrate_repo/versions/002_sqlite_downgrade.sql |  388 +
 .../versions/003_add_label_to_networks.py          |   42 +
 .../migrate_repo/versions/003_sqlite_downgrade.sql |  111 +
 .../migrate_repo/versions/004_add_zone_tables.py   |   66 +
 .../versions/005_add_instance_metadata.py          |   81 +
 .../versions/006_add_provider_data_to_volumes.py   |   54 +
 .../migrate_repo/versions/006_sqlite_downgrade.sql |  113 +
 .../versions/007_add_ipv6_to_fixed_ips.py          |   70 +
 .../migrate_repo/versions/007_sqlite_downgrade.sql |   79 +
 .../versions/008_add_instance_types.py             |   85 +
 .../versions/009_add_instance_migrations.py        |   70 +
 .../versions/010_add_os_type_to_instances.py       |   45 +
 .../migrate_repo/versions/011_live_migration.py    |   85 +
 .../versions/012_add_ipv6_flatmanager.py           |   90 +
 .../migrate_repo/versions/012_sqlite_upgrade.sql   |  195 +
 .../versions/013_add_flavors_to_migrations.py      |   43 +
 .../migrate_repo/versions/013_sqlite_downgrade.sql |   69 +
 .../014_add_instance_type_id_to_instances.py       |   74 +
 .../015_add_auto_assign_to_floating_ips.py         |   35 +
 .../migrate_repo/versions/015_sqlite_downgrade.sql |   62 +
 .../versions/016_make_quotas_key_and_value.py      |  213 +
 .../017_make_instance_type_id_an_integer.py        |   87 +
 .../versions/018_rename_server_management_url.py   |   35 +
 .../versions/019_add_volume_snapshot_support.py    |   82 +
 .../versions/020_add_snapshot_id_to_volumes.py     |   40 +
 .../migrate_repo/versions/020_sqlite_downgrade.sql |  119 +
 .../migrate_repo/versions/021_rename_image_ids.py  |   38 +
 .../versions/022_set_engine_mysql_innodb.py        |   64 +
 .../versions/023_add_vm_mode_to_instances.py       |   42 +
 .../versions/024_add_block_device_mapping.py       |   92 +
 .../versions/025_add_uuid_to_instances.py          |   45 +
 .../migrate_repo/versions/026_add_agent_table.py   |   89 +
 .../versions/027_add_provider_firewall_rules.py    |   65 +
 .../versions/028_add_instance_type_extra_specs.py  |   76 +
 .../versions/029_add_zone_weight_offsets.py        |   41 +
 .../migrate_repo/versions/030_multi_nic.py         |  146 +
 .../migrate_repo/versions/030_sqlite_downgrade.sql |  377 +
 .../031_fk_fixed_ips_virtual_interface_id.py       |   59 +
 .../migrate_repo/versions/031_sqlite_downgrade.sql |   48 +
 .../migrate_repo/versions/031_sqlite_upgrade.sql   |   48 +
 .../versions/032_add_root_device_name.py           |   42 +
 .../migrate_repo/versions/033_ha_network.py        |   42 +
 .../migrate_repo/versions/033_sqlite_downgrade.sql |  193 +
 .../034_change_instance_id_in_migrations.py        |   46 +
 .../migrate_repo/versions/035_secondary_dns.py     |   39 +
 .../versions/036_change_flavor_id_in_migrations.py |   79 +
 .../versions/037_instances_drop_admin_pass.py      |   42 +
 .../versions/038_add_uuid_to_virtual_interfaces.py |   45 +
 .../migrate_repo/versions/038_sqlite_downgrade.sql |   63 +
 .../versions/039_add_instances_accessip.py         |   49 +
 .../versions/040_add_uuid_to_networks.py           |   45 +
 .../versions/041_add_config_drive_to_instances.py  |   36 +
 .../versions/042_add_volume_types_and_extradata.py |  122 +
 .../migrate_repo/versions/042_sqlite_downgrade.sql |  129 +
 .../migrate_repo/versions/043_add_vsa_data.py      |   84 +
 .../versions/044_update_instance_states.py         |   52 +
 .../versions/045_add_network_priority.py           |   44 +
 .../migrate_repo/versions/046_add_instance_swap.py |   49 +
 .../versions/047_remove_instances_fk_from_vif.py   |   61 +
 .../migrate_repo/versions/047_sqlite_downgrade.sql |   46 +
 .../migrate_repo/versions/047_sqlite_upgrade.sql   |   45 +
 .../migrate_repo/versions/048_add_zone_name.py     |   33 +
 .../versions/049_add_instances_progress.py         |   44 +
 .../versions/050_add_disk_config_to_instances.py   |   37 +
 .../migrate_repo/versions/050_sqlite_downgrade.sql |  207 +
 .../051_add_vcpu_weight_to_instance_types.py       |   34 +
 .../versions/052_kill_export_devices.py            |   65 +
 ..._add_connection_info_to_block_device_mapping.py |   38 +
 .../migrate_repo/versions/053_sqlite_downgrade.sql |   87 +
 .../versions/054_add_bw_usage_data_cache.py        |   64 +
 .../versions/055_convert_flavor_id_to_str.py       |  112 +
 .../migrate_repo/versions/056_add_s3_images.py     |   60 +
 .../versions/057_add_sm_driver_tables.py           |  113 +
 .../versions/058_rename_managed_disk.py            |   37 +
 .../versions/059_split_rxtx_quota_into_network.py  |   61 +
 .../migrate_repo/versions/059_sqlite_downgrade.sql |  137 +
 .../migrate_repo/versions/059_sqlite_upgrade.sql   |   87 +
 .../versions/060_remove_network_fk_from_vif.py     |   62 +
 .../migrate_repo/versions/060_sqlite_downgrade.sql |   45 +
 .../migrate_repo/versions/060_sqlite_upgrade.sql   |   44 +
 .../versions/061_add_index_to_instance_uuid.py     |   29 +
 .../versions/062_add_instance_info_cache_table.py  |   70 +
 .../versions/063_add_instance_faults_table.py      |   60 +
 ...ange_instance_id_to_uuid_in_instance_actions.py |   80 +
 .../065_add_index_to_instance_project_id.py        |   31 +
 .../066_preload_instance_info_cache_table.py       |   31 +
 .../067_add_pool_and_interface_to_floating_ip.py   |   41 +
 .../migrate_repo/versions/067_sqlite_downgrade.sql |   69 +
 .../versions/068_add_instance_attribute.py         |   36 +
 .../migrate_repo/versions/068_sqlite_downgrade.sql |  219 +
 .../migrate_repo/versions/069_block_migration.py   |   50 +
 .../migrate_repo/versions/070_sqlite_downgrade.sql |  103 +
 .../migrate_repo/versions/070_sqlite_upgrade.sql   |   99 +
 .../versions/070_untie_nova_network_models.py      |  100 +
 .../versions/071_add_host_aggregate_tables.py      |  108 +
 .../migrate_repo/versions/072_add_dns_table.py     |   77 +
 .../migrate_repo/versions/072_mysql_upgrade.sql    |   13 +
 .../migrate_repo/versions/073_add_capacity.py      |   49 +
 .../versions/074_change_flavor_local_gb.py         |  130 +
 .../migrate_repo/versions/074_sqlite_upgrade.sql   |  313 +
 .../075_convert_bw_usage_to_store_network_id.py    |   97 +
 .../versions/076_remove_unique_constraints.py      |   84 +
 .../migrate_repo/versions/076_sqlite_upgrade.sql   |   61 +
 .../migrate_repo/versions/077_convert_to_utf8.py   |   61 +
 .../versions/078_add_rpc_info_to_zones.py          |   46 +
 .../migrate_repo/versions/078_sqlite_downgrade.sql |   35 +
 .../versions/079_add_zone_name_to_instances.py     |   30 +
 ...080_add_hypervisor_hostname_to_compute_nodes.py |   30 +
 .../versions/081_drop_instance_id_bw_cache.py      |   69 +
 .../migrate_repo/versions/082_zone_to_cell.py      |   35 +
 .../migrate_repo/versions/083_quota_class.py       |   61 +
 .../migrate_repo/versions/084_quotas_unlimited.py  |   43 +
 .../085_add_index_to_fixed_ips_by_address.py       |   31 +
 .../versions/086_set_engine_mysql_innodb.py        |   44 +
 .../versions/087_add_uuid_to_bw_usage_cache.py     |   56 +
 ..._instance_id_to_uuid_in_block_device_mapping.py |   81 +
 .../migrate_repo/versions/088_sqlite_downgrade.sql |   97 +
 .../migrate_repo/versions/088_sqlite_upgrade.sql   |   97 +
 .../versions/089_add_volume_id_mappings.py         |  116 +
 .../versions/090_modify_volume_id_datatype.py      |  239 +
 .../migrate_repo/versions/090_sqlite_downgrade.sql |  226 +
 .../migrate_repo/versions/090_sqlite_upgrade.sql   |  226 +
 .../versions/091_convert_volume_ids_to_uuid.py     |  145 +
 cinder/db/sqlalchemy/migration.py                  |  129 +
 cinder/db/sqlalchemy/models.py                     | 1063 ++
 cinder/db/sqlalchemy/session.py                    |  156 +
 cinder/exception.py                                |  938 ++
 cinder/flags.py                                    |  356 +
 cinder/locale/bs/LC_MESSAGES/nova.po               | 8201 ++++++++++
 cinder/locale/cs/LC_MESSAGES/nova.po               | 8251 ++++++++++
 cinder/locale/da/LC_MESSAGES/nova.po               | 8203 ++++++++++
 cinder/locale/de/LC_MESSAGES/nova.po               | 8208 ++++++++++
 cinder/locale/en_AU/LC_MESSAGES/nova.po            | 8209 ++++++++++
 cinder/locale/en_GB/LC_MESSAGES/nova.po            | 8209 ++++++++++
 cinder/locale/es/LC_MESSAGES/nova.po               | 8220 ++++++++++
 cinder/locale/fr/LC_MESSAGES/nova.po               | 8251 ++++++++++
 cinder/locale/it/LC_MESSAGES/nova.po               | 8210 ++++++++++
 cinder/locale/ja/LC_MESSAGES/nova.po               | 8196 ++++++++++
 cinder/locale/ko/LC_MESSAGES/nova.po               | 8207 ++++++++++
 cinder/locale/nova.pot                             | 7463 +++++++++
 cinder/locale/pt_BR/LC_MESSAGES/nova.po            | 8208 ++++++++++
 cinder/locale/ru/LC_MESSAGES/nova.po               | 8304 ++++++++++
 cinder/locale/tl/LC_MESSAGES/nova.po               | 8200 ++++++++++
 cinder/locale/tr/LC_MESSAGES/nova.po               | 8202 ++++++++++
 cinder/locale/uk/LC_MESSAGES/nova.po               | 8199 ++++++++++
 cinder/locale/zh_CN/LC_MESSAGES/nova.po            | 8064 ++++++++++
 cinder/locale/zh_TW/LC_MESSAGES/nova.po            | 8207 ++++++++++
 cinder/log.py                                      |  416 +
 cinder/manager.py                                  |  205 +
 cinder/notifier/__init__.py                        |   14 +
 cinder/notifier/api.py                             |  133 +
 cinder/notifier/capacity_notifier.py               |   81 +
 cinder/notifier/list_notifier.py                   |   71 +
 cinder/notifier/log_notifier.py                    |   34 +
 cinder/notifier/no_op_notifier.py                  |   19 +
 cinder/notifier/rabbit_notifier.py                 |   46 +
 cinder/notifier/test_notifier.py                   |   25 +
 cinder/openstack/__init__.py                       |   15 +
 cinder/openstack/common/README                     |   13 +
 cinder/openstack/common/__init__.py                |   15 +
 cinder/openstack/common/cfg.py                     | 1298 ++
 cinder/openstack/common/exception.py               |  147 +
 cinder/openstack/common/importutils.py             |   45 +
 cinder/openstack/common/iniparser.py               |  126 +
 cinder/openstack/common/local.py                   |   37 +
 cinder/policy.py                                   |   90 +
 cinder/quota.py                                    |  234 +
 cinder/rootwrap/__init__.py                        |   16 +
 cinder/rootwrap/filters.py                         |  147 +
 cinder/rootwrap/volume.py                          |   45 +
 cinder/rootwrap/wrapper.py                         |   60 +
 cinder/rpc/__init__.py                             |  227 +
 cinder/rpc/amqp.py                                 |  405 +
 cinder/rpc/common.py                               |  220 +
 cinder/rpc/impl_fake.py                            |  185 +
 cinder/rpc/impl_kombu.py                           |  713 +
 cinder/rpc/impl_qpid.py                            |  563 +
 cinder/scheduler/__init__.py                       |   27 +
 cinder/scheduler/api.py                            |   72 +
 cinder/scheduler/chance.py                         |   83 +
 cinder/scheduler/driver.py                         |  164 +
 cinder/scheduler/host_manager.py                   |   36 +
 cinder/scheduler/manager.py                        |  204 +
 cinder/scheduler/simple.py                         |  144 +
 cinder/service.py                                  |  429 +
 cinder/test.py                                     |  295 +
 cinder/testing/README.rst                          |   66 +
 cinder/testing/fake/__init__.py                    |    1 +
 cinder/testing/runner.py                           |  372 +
 cinder/tests/__init__.py                           |   84 +
 cinder/tests/api/__init__.py                       |   19 +
 cinder/tests/api/openstack/__init__.py             |   19 +
 cinder/tests/api/openstack/common.py               |   58 +
 cinder/tests/api/openstack/fakes.py                |  234 +
 cinder/tests/api/openstack/test_common.py          |  526 +
 cinder/tests/api/openstack/test_faults.py          |  208 +
 cinder/tests/api/openstack/test_wsgi.py            |  833 +
 cinder/tests/api/openstack/test_xmlutil.py         |  722 +
 cinder/tests/api/openstack/volume/__init__.py      |   19 +
 .../tests/api/openstack/volume/contrib/__init__.py |   19 +
 .../volume/contrib/test_types_extra_specs.py       |  202 +
 .../openstack/volume/contrib/test_types_manage.py  |  103 +
 .../api/openstack/volume/extensions/__init__.py    |   15 +
 .../api/openstack/volume/extensions/foxinsocks.py  |   94 +
 .../tests/api/openstack/volume/test_extensions.py  |  156 +
 cinder/tests/api/openstack/volume/test_router.py   |  105 +
 .../tests/api/openstack/volume/test_snapshots.py   |  214 +
 cinder/tests/api/openstack/volume/test_types.py    |  146 +
 cinder/tests/api/openstack/volume/test_volumes.py  |  290 +
 cinder/tests/api/test_auth.py                      |   58 +
 cinder/tests/api/test_sizelimit.py                 |   51 +
 cinder/tests/api/test_wsgi.py                      |   67 +
 cinder/tests/db/__init__.py                        |   20 +
 cinder/tests/db/fakes.py                           |   47 +
 cinder/tests/declare_flags.py                      |   23 +
 cinder/tests/fake_flags.py                         |   34 +
 cinder/tests/fake_utils.py                         |  112 +
 cinder/tests/integrated/__init__.py                |   22 +
 cinder/tests/integrated/api/__init__.py            |   20 +
 cinder/tests/integrated/api/client.py              |  217 +
 cinder/tests/integrated/integrated_helpers.py      |  130 +
 cinder/tests/integrated/test_extensions.py         |   42 +
 cinder/tests/integrated/test_login.py              |   31 +
 cinder/tests/integrated/test_volumes.py            |  181 +
 cinder/tests/integrated/test_xml.py                |   52 +
 cinder/tests/monkey_patch_example/__init__.py      |   33 +
 cinder/tests/monkey_patch_example/example_a.py     |   29 +
 cinder/tests/monkey_patch_example/example_b.py     |   30 +
 cinder/tests/notifier/__init__.py                  |   16 +
 cinder/tests/notifier/test_capacity_notifier.py    |   59 +
 cinder/tests/notifier/test_list_notifier.py        |   84 +
 cinder/tests/policy.json                           |   25 +
 cinder/tests/rpc/__init__.py                       |   19 +
 cinder/tests/rpc/common.py                         |  239 +
 cinder/tests/rpc/test_common.py                    |  147 +
 cinder/tests/rpc/test_fake.py                      |   33 +
 cinder/tests/rpc/test_kombu.py                     |  350 +
 cinder/tests/rpc/test_kombu_ssl.py                 |   58 +
 cinder/tests/rpc/test_qpid.py                      |  340 +
 cinder/tests/runtime_flags.py                      |   23 +
 cinder/tests/scheduler/__init__.py                 |   19 +
 cinder/tests/scheduler/fakes.py                    |   62 +
 cinder/tests/scheduler/test_scheduler.py           |  322 +
 cinder/tests/test_SolidFireSanISCSIDriver.py       |  186 +
 cinder/tests/test_api.py                           |   75 +
 cinder/tests/test_compat_flagfile.py               |  175 +
 cinder/tests/test_context.py                       |   70 +
 cinder/tests/test_db_api.py                        |  331 +
 cinder/tests/test_exception.py                     |  126 +
 cinder/tests/test_flags.py                         |  146 +
 cinder/tests/test_iscsi.py                         |  116 +
 cinder/tests/test_log.py                           |  218 +
 cinder/tests/test_migrations.conf                  |    9 +
 cinder/tests/test_migrations.py                    |  296 +
 cinder/tests/test_misc.py                          |  184 +
 cinder/tests/test_netapp.py                        |  927 ++
 cinder/tests/test_nexenta.py                       |  281 +
 cinder/tests/test_notifier.py                      |  133 +
 cinder/tests/test_nova_rootwrap.py                 |  133 +
 cinder/tests/test_policy.py                        |  189 +
 cinder/tests/test_quota.py                         |  316 +
 cinder/tests/test_service.py                       |  221 +
 cinder/tests/test_skip_examples.py                 |   47 +
 cinder/tests/test_test.py                          |   44 +
 cinder/tests/test_test_utils.py                    |   29 +
 cinder/tests/test_utils.py                         | 1188 ++
 cinder/tests/test_versions.py                      |   59 +
 cinder/tests/test_volume.py                        |  501 +
 cinder/tests/test_volume_types.py                  |  167 +
 cinder/tests/test_volume_types_extra_specs.py      |  130 +
 cinder/tests/test_wsgi.py                          |   92 +
 cinder/tests/utils.py                              |   25 +
 cinder/utils.py                                    | 1678 ++
 cinder/version.py                                  |   38 +
 cinder/volume/__init__.py                          |   25 +
 cinder/volume/api.py                               |  371 +
 cinder/volume/driver.py                            |  709 +
 cinder/volume/iscsi.py                             |  160 +
 cinder/volume/manager.py                           |  331 +
 cinder/volume/netapp.py                            |  676 +
 cinder/volume/nexenta/__init__.py                  |   33 +
 cinder/volume/nexenta/jsonrpc.py                   |   84 +
 cinder/volume/nexenta/volume.py                    |  282 +
 cinder/volume/san.py                               |  897 ++
 cinder/volume/volume_types.py                      |  125 +
 cinder/volume/xensm.py                             |  237 +
 cinder/wsgi.py                                     |  374 +
 contrib/openstack-config                           |   65 +
 contrib/redhat-eventlet.patch                      |   16 +
 doc/.gitignore                                     |    3 +
 doc/Makefile                                       |   97 +
 doc/README.rst                                     |   55 +
 doc/ext/nova_autodoc.py                            |   12 +
 doc/ext/nova_todo.py                               |  101 +
 doc/find_autodoc_modules.sh                        |   20 +
 doc/generate_autodoc_index.sh                      |   46 +
 doc/source/_ga/layout.html                         |   17 +
 doc/source/_static/basic.css                       |  416 +
 doc/source/_static/default.css                     |  230 +
 doc/source/_static/jquery.tweet.js                 |  154 +
 doc/source/_static/tweaks.css                      |  218 +
 doc/source/_theme/layout.html                      |   95 +
 doc/source/_theme/theme.conf                       |    5 +
 doc/source/conf.py                                 |  234 +
 doc/source/devref/addmethod.openstackapi.rst       |   56 +
 doc/source/devref/aggregates.rst                   |   65 +
 doc/source/devref/api.rst                          |  270 +
 doc/source/devref/architecture.rst                 |   52 +
 doc/source/devref/auth.rst                         |  276 +
 doc/source/devref/cloudpipe.rst                    |  166 +
 doc/source/devref/database.rst                     |   63 +
 doc/source/devref/development.environment.rst      |  152 +
 doc/source/devref/down.sh                          |    7 +
 doc/source/devref/fakes.rst                        |   85 +
 doc/source/devref/filter_scheduler.rst             |  258 +
 doc/source/devref/gerrit.rst                       |   16 +
 doc/source/devref/glance.rst                       |   28 +
 doc/source/devref/il8n.rst                         |   34 +
 doc/source/devref/index.rst                        |   86 +
 doc/source/devref/interfaces                       |   17 +
 doc/source/devref/jenkins.rst                      |   41 +
 doc/source/devref/launchpad.rst                    |   54 +
 doc/source/devref/multinic.rst                     |   39 +
 doc/source/devref/network.rst                      |  128 +
 doc/source/devref/nova.rst                         |  215 +
 doc/source/devref/rc.local                         |   36 +
 doc/source/devref/rpc.rst                          |  151 +
 doc/source/devref/scheduler.rst                    |   71 +
 doc/source/devref/server.conf.template             |   34 +
 doc/source/devref/services.rst                     |   55 +
 doc/source/devref/threading.rst                    |   51 +
 doc/source/devref/unit_tests.rst                   |  159 +
 doc/source/devref/up.sh                            |    7 +
 doc/source/devref/volume.rst                       |   66 +
 doc/source/devref/xensmvolume.rst                  |   88 +
 doc/source/image_src/multinic_1.odg                |  Bin 0 -> 12363 bytes
 doc/source/image_src/multinic_2.odg                |  Bin 0 -> 13425 bytes
 doc/source/image_src/multinic_3.odg                |  Bin 0 -> 13598 bytes
 doc/source/images/NOVA_ARCH.png                    |  Bin 0 -> 191332 bytes
 doc/source/images/NOVA_ARCH.svg                    | 5854 +++++++
 doc/source/images/NOVA_ARCH_200dpi.png             |  Bin 0 -> 439024 bytes
 doc/source/images/NOVA_ARCH_66dpi.png              |  Bin 0 -> 110890 bytes
 doc/source/images/NOVA_clouds_A_B.png              |  Bin 0 -> 77007 bytes
 doc/source/images/NOVA_clouds_A_B.svg              |16342 ++++++++++++++++++++
 doc/source/images/NOVA_clouds_C1_C2.svg            | 9763 ++++++++++++
 doc/source/images/NOVA_clouds_C1_C2.svg.png        |  Bin 0 -> 448574 bytes
 doc/source/images/Novadiagram.png                  |  Bin 0 -> 52609 bytes
 doc/source/images/base_scheduler.png               |  Bin 0 -> 17068 bytes
 doc/source/images/cloudpipe.png                    |  Bin 0 -> 89812 bytes
 doc/source/images/fabric.png                       |  Bin 0 -> 125915 bytes
 doc/source/images/filteringWorkflow1.png           |  Bin 0 -> 66997 bytes
 doc/source/images/filteringWorkflow2.png           |  Bin 0 -> 75288 bytes
 doc/source/images/multinic_dhcp.png                |  Bin 0 -> 54531 bytes
 doc/source/images/multinic_flat.png                |  Bin 0 -> 40871 bytes
 doc/source/images/multinic_vlan.png                |  Bin 0 -> 58552 bytes
 doc/source/images/nova.compute.api.create.png      |  Bin 0 -> 50171 bytes
 doc/source/images/novascreens.png                  |  Bin 0 -> 27949 bytes
 doc/source/images/novashvirtually.png              |  Bin 0 -> 39000 bytes
 doc/source/images/rpc/arch.png                     |  Bin 0 -> 26690 bytes
 doc/source/images/rpc/arch.svg                     |  292 +
 doc/source/images/rpc/flow1.png                    |  Bin 0 -> 40982 bytes
 doc/source/images/rpc/flow1.svg                    |  617 +
 doc/source/images/rpc/flow2.png                    |  Bin 0 -> 30650 bytes
 doc/source/images/rpc/flow2.svg                    |  423 +
 doc/source/images/rpc/rabt.png                     |  Bin 0 -> 44964 bytes
 doc/source/images/rpc/rabt.svg                     |  581 +
 doc/source/images/rpc/state.png                    |  Bin 0 -> 38543 bytes
 doc/source/images/vmwareapi_blockdiagram.jpg       |  Bin 0 -> 75363 bytes
 doc/source/images/zone_aware_overview.png          |  Bin 0 -> 56142 bytes
 doc/source/images/zone_aware_scheduler.png         |  Bin 0 -> 20902 bytes
 doc/source/images/zone_overview.png                |  Bin 0 -> 51587 bytes
 doc/source/index.rst                               |   67 +
 doc/source/man/nova-manage.rst                     |  281 +
 etc/cinder/api-paste.ini                           |   51 +
 etc/cinder/cinder.conf.sample                      |  673 +
 etc/cinder/logging_sample.conf                     |   76 +
 etc/cinder/policy.json                             |   15 +
 openstack-common.conf                              |    7 +
 pylintrc                                           |   38 +
 run_tests.sh                                       |  176 +
 setup.cfg                                          |   32 +
 setup.py                                           |   73 +
 tools/clean-vlans                                  |   25 +
 tools/clean_file_locks.py                          |   63 +
 tools/conf/create_conf.py                          |  159 +
 tools/conf/generate_sample.sh                      |   25 +
 tools/enable-pre-commit-hook.sh                    |   42 +
 tools/hacking.py                                   |  391 +
 tools/install_venv.py                              |  248 +
 tools/pip-requires                                 |   22 +
 tools/rfc.sh                                       |  150 +
 tools/test-requires                                |   11 +
 tools/with_venv.sh                                 |    4 +
 tox.ini                                            |   38 +
 458 files changed, 247534 insertions(+)