summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge "Create initiator id if not exist in VMAX driver"2015.1.0rc1proposed/kiloJenkins2015-04-095-13/+101
|\
| * Create initiator id if not exist in VMAX driverXing Yang2015-04-065-13/+101
* | Merge "Fix the unicode encode error when create volume"Jenkins2015-04-092-2/+12
|\ \
| * | Fix the unicode encode error when create volumewanghao2015-03-092-2/+12
* | | Merge "GlusterFS: Returning provider location of volume from snapshot"Jenkins2015-04-091-1/+1
|\ \ \
| * | | GlusterFS: Returning provider location of volume from snapshotBharat Kumar Kobagana2015-04-081-1/+1
* | | | Merge "Fix multipath device discovery when UFN is enabled."Jenkins2015-04-082-20/+55
|\ \ \ \
| * | | | Fix multipath device discovery when UFN is enabled.Lee Yarwood2015-04-022-20/+55
* | | | | Merge "Revert "Removing Windows drivers""Jenkins2015-04-084-0/+895
|\ \ \ \ \
| * | | | | Revert "Removing Windows drivers"Mike Perez2015-04-074-0/+895
| | |/ / / | |/| | |
* | | | | Merge "Delete the temporary volume if migration fails"Jenkins2015-04-083-40/+199
|\ \ \ \ \
| * | | | | Delete the temporary volume if migration failsVincent Hou2015-04-083-40/+199
| |/ / / /
* | | | | Merge "Rbd update volume stats in wrong way"Jenkins2015-04-082-13/+30
|\ \ \ \ \
| * | | | | Rbd update volume stats in wrong waywuyuting2015-04-072-13/+30
* | | | | | Merge "Correct cinder hacking check numbering"Jenkins2015-04-082-26/+26
|\ \ \ \ \ \
| * | | | | | Correct cinder hacking check numberingJay S. Bryant2015-04-072-26/+26
* | | | | | | Merge "Add hacking check for print() statements"Jenkins2015-04-085-10/+42
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Add hacking check for print() statementsJay S. Bryant2015-04-075-10/+42
* | | | | | Merge "Partial Revert "Removing ZFSSA driver""Jenkins2015-04-076-0/+2004
|\ \ \ \ \ \
| * | | | | | Partial Revert "Removing ZFSSA driver"Mike Perez2015-04-066-0/+2004
* | | | | | | Merge "Add missing copy_volume_to_image method to Sheepdog driver"Jenkins2015-04-072-0/+63
|\ \ \ \ \ \ \
| * | | | | | | Add missing copy_volume_to_image method to Sheepdog driverYAMADA Hideki2015-04-072-0/+63
| |/ / / / / /
* | | | | | | Merge "Partial Revert "Removing Huawei drivers""Jenkins2015-04-076-0/+3279
|\ \ \ \ \ \ \
| * | | | | | | Partial Revert "Removing Huawei drivers"Mike Perez2015-04-076-0/+3279
| |/ / / / / /
* | | | | | | Merge "Set volume_attachment to [] for the temporary volume creation"Jenkins2015-04-072-60/+113
|\ \ \ \ \ \ \
| * | | | | | | Set volume_attachment to [] for the temporary volume creationVincent Hou2015-04-022-60/+113
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge "More error handling on EMC VNX migration failure"Jenkins2015-04-072-20/+146
|\ \ \ \ \ \ \
| * | | | | | | More error handling on EMC VNX migration failureJeegn Chen2015-04-022-20/+146
* | | | | | | | Merge "Fixed encrypted property for 3PAR FC and iSCSI drivers"Jenkins2015-04-073-3/+156
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fixed encrypted property for 3PAR FC and iSCSI driversAnthony Lee2015-04-063-3/+156
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge "Revert "Removing Netapp FC drivers for no reported CI""Jenkins2015-04-064-0/+185
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Revert "Removing Netapp FC drivers for no reported CI"Alex Meade2015-04-014-0/+185
* | | | | | | Merge "Check volume status in detach db api"Jenkins2015-04-062-1/+28
|\ \ \ \ \ \ \
| * | | | | | | Check volume status in detach db apiAbhijeet Malawade2015-03-312-1/+28
* | | | | | | | Merge "Added provider_id to volume and snapshot object"Jenkins2015-04-064-0/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Added provider_id to volume and snapshot objectyogeshprasad2015-03-134-0/+19
* | | | | | | | | Merge "VMware: Fix instance_uuid access in volume retype"Jenkins2015-04-062-3/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | VMware: Fix instance_uuid access in volume retypeVipin Balachandran2015-03-302-3/+19
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Use six.text_type instead of unicode"Jenkins2015-04-0618-33/+68
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use six.text_type instead of unicodeIvan Kolodyazhny2015-04-0219-35/+70
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge "Logging not using oslo.i18n guidelines"Jenkins2015-04-069-197/+187
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Logging not using oslo.i18n guidelinesSean McGinnis2015-03-309-197/+187
* | | | | | | | | | Merge "Fix argument order in assertEqual: tests/test_service.py"Jenkins2015-04-061-10/+8
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Fix argument order in assertEqual: tests/test_service.pySai Kiran2015-02-191-10/+8
* | | | | | | | | | Merge "VMware: Skip vSAN for preallocated image download"Jenkins2015-04-055-58/+366
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | VMware: Skip vSAN for preallocated image downloadVipin Balachandran2015-04-025-58/+366
* | | | | | | | | | | Merge "Fixes nits in check_no_contextlib_nested"Jenkins2015-04-052-1/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixes nits in check_no_contextlib_nestedChangBo Guo(gcb)2015-03-192-1/+6
* | | | | | | | | | | | Merge "Add project_id to barbican keymgr wrapper"Jenkins2015-04-052-1/+51
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add project_id to barbican keymgr wrapperBrianna Poulos2015-03-102-1/+51