Merge "Fix HP LeftHand Performance issue with AO"
gpfs driver: fix logging problems

Fixed the string formatting template issues
Fixed the name collision on the _ variable by changing the variable name to err

Closes-Bug: #1289382

Change-Id: Id690c2b6dcd5e9732330e6b98be34819586b78fc
Merge "Include next link when default limit is reached"
Clean Up EMC VNX Direct Driver in Cinder

This patch cleans up issues discovered during the review of
EMC VNX Direct Driver.

https://review.openstack.org/#/c/73672/

Implements blueprint emc-vnx-direct-driver
Closes-Bug: #1287944

Change-Id: I4002ef9ea14e2d843dd8cbccffa025997a54c738
Merge "Clean Up EMC VNX Direct Driver in Cinder"
GPFS unit tests: increased coverage, uses mock

Increased unit tests coverage for the GPFS driver 100%.
All tests make usage of mock.
This helped to uncover bugs in the error path (see 1289382).

Closes-bug: 1290921

Change-Id: Ic78ac9b49c6e22231b966052f65d8ae07824379e
Fixed spelling error - accomodate to accommodate

Change-Id: I88bc2c3034e4fdc19b7d0a0e0ebf7eb5b2ad44f7
Merge "Sync log.py from oslo"
Merge "Sync latest Oslo config code for i18n"
Merge "Re-enable lazy translation"
3PAR: Support extend volume based on snapshot

If extend volume fails with an HTTP Forbidden error 150,
convert the volume to a base volume and retry extending.

Change-Id: Id407058e954b2630f4a7f31c6149361301b502f2
Closes-Bug: #1285906
EMC SMI-S delete snapshot unit test takes too long

EMC SMI-S unit test for deleting snapshot takes too long.
This patch sets Timout to 0 in cinder_emc_config.xml
so that it will return immediately.  Without this fix,
it will wait for 10 seconds by default.

Change-Id: I223f6741a2ce393e555467350201a695ae210152
Closes-Bug: #1289653
get volumes API does not handle limit=0

This bug fixes a regression from bug 1288429, where the "next"
link is added when the number of volumes returned is the
maximum limit (even if the "limit" param is not specified).

The regression is hit when a "limit" of 0 is specified; in this
case the logic to create the "next" link is still executed and an
exception is thrown. The fix is to add back in the "if" check that
implictly checks if the max_items is non-0.

Test code was also created to verify that a limit of 0 is handled
correctly.

Change-Id: I92f9afb9b0e2c627d2c77f67fa026b731903384f
Closes-bug: 1289124
Merge "EMC SMI-S delete snapshot unit test takes too long"
Merge "Fixed spelling error - accomodate to accommodate"
Merge "gpfs driver: fix logging problems"
Merge "get volumes API does not handle limit=0"
Merge "vmware: Storage policy based volume placement."
Merge "vmware: check datastore availability during create"
Merge "vmware: default global pbm policy configuration"