Merge "Allow display_name for v2 snapshot-update"
Merge "Fixes call GlanceConnectionFailed in invalid ARG"
Use built-in print() instead of print statement

In python 3 print statement is not supported, so we should use
only print() functions.

Fixes bug 1226943

Change-Id: I7b2e4d52fe9050f6a67c44e4cc1237a15ea90b23
Merge "Use built-in print() instead of print statement"
Merge "assertEquals is deprecated, use assertEqual"
Merge "Fixes call VolumeNotFound in the invalid argument"
Merge "fix wrong desciption of monkey_patch config"
Merge "Fix huawei driver test issues"
Sync gettextutils from oslo

Some Messages, such as those created from Invalid exceptions, use a
Message within a Message, and we were only translating the base Message
but not the Message substitution within.

Also adds test case for cinder case.

Fixes bug: #1221808

Change-Id: Ic3119df23a090cfaa160c1461e955f0af55fe1cf
Merge "Fix __init__ methods of brick initiator connectors"
remove VolumeNotFoundForInstance class

VolumeNotFoundForInstance class is used only in test_xiv_ds8k.py.  I
think the exception class that is used only in test code should not be
defined in cinder/exception.py.

Change-Id: I53512d9b06d48e1fb98ef63eac82c033cec37471
Closes-Bug: #1227477
GPFS Driver missing clone depth limit for snapshots

GPFS driver is fixed to handle snapshot clones correctly. Previously,
these were allowed to grow without respecting limit defined in config
flag gpfs_max_clone_depth.  This change adds the depth check operation
in create_snapshot.

To ensure that all clone files are cleaned up, the delete_snapshot
method now marks snapshots to be deleted with ts file extension
and attempts to delete the snapshot.  If the snapshot cannot be
deleted because it has clone children, it will be deleted when the
child is deleted.

Closes-Bug: #1227366

Change-Id: I4fb2a720b55dbe033159e6fb341f6e2f1508776e
Merge "Sync gettextutils from oslo"
Merge "remove VolumeNotFoundForInstance class"
Merge "VMware driver: Fix for invalid datastore selection"
Merge "Pass down root_helper in more cases"
Add logging to prior to raising exceptions

This patch fixes an issue where exceptions
happen in the 3PAR drivers and the exceptions
aren't being logged to the log file.

Fixes bug #1225235

Change-Id: I8ec26fe3bee65106e01e956472e06acf1d5b9f77
Fix type change in bootable setting of volume view

Change Idd47a0a8069ee905b81c7aae562b82767ad91930 fixed a db
query issue, by removing the image_metadata querie in the get/show
methods.

The problem however is that we just passed the setting from the volume
object directly in the summary view builder.  This results in changing
the type of the value from a string "true/false" to a bool True/False
which is no good.

This patch converts the object member back to a string like it used to
be so we don't break any compat or expectations in API behavior.

Fixes bug #1227837

Change-Id: I55c0e25134ae429802ddf313d6d26f1fad19ca94
Merge "Add logging to prior to raising exceptions"
Merge "NetApp fix create vol different size than snapshot"