merged from cinder
Merge branch 'master' of https://github.com/openstack/cinder
Use the local configuration in the nfs drivers

Fixes bug 1158681

Change-Id: If797a5d3241d6129a8fefea1222b723f03f86452
Fix bug with 3PAR host entry in wrong domain

This patch exposes a more acurate exception message
when a user has created a manual host entry on a
3PAR system that is in an incorrect 3PAR domain than
the domain that is configured for the 3PAR driver.

The bug complained that it couldn't find a VLUN, when the
actual problem was the host existed in the wrong 3PAR domain.

Fixes bug #1158991

Change-Id: I3f92e59ae43a10a0788d97d987785b6520f9f1be
Merge "Fix bug with 3PAR host entry in wrong domain"
Mark sql_connection with secret flag

sql_connection contains the password in some setups and marking as
secret prevents accidental logging

fixes bug 1160680

Change-Id: I3704237d0923bb30138b5ece7e5c7bbda0a78b9b
Merge "Use the local configuration in the nfs drivers"
getLogger should be called after logging is configured

logging needs to be setup properly before we try to log
something. Fixed one spot from logging->LOG

Fixes LP# 1161038

Change-Id: I87743cff9062e47c1d5e989c2c0c05c3921b65c7
Add snapshot events to the cinder notification

Added and tested snapshot.create.start & snapshot.create.end
on creation of a new snapshot

Added and tested snapshot.delete.start & snapshot.delete.end
on the deletion of a snapshot

Change-Id: Ic3c1cc8949109149c59cf106a24b4eb0d8ba5580
Enforce exclusive options snapshot-id, source-volid and image-id

Fixed checks in api that volume create receives only one of
snapshot-id, source-volid or image-id.

Fixes bug #1161437

Change-Id: Ibe5ca4bb81e69b0f8e1abe1c2cffe587dc10e3ca
Merge "Mark sql_connection with secret flag"
Merge "getLogger should be called after logging is configured"
REST session validity not checked in get_volume_info

The fix for bug 1157242 introduced a new bug in Coraid cinder driver
_get_volume_info that the login session is not checked for
validity/timeout.  This change addressesthat issue for all
methods in the CoraidRESTClient class.

Fixes bug 1160459

Change-Id: Ib2d7ebbf3ef8ec35071f51c6168eb9b3af9405e6
Merge "Add snapshot events to the cinder notification"
Merge "REST session validity not checked in get_volume_info"
Fix IBM copyright strings

Update IBM copyright strings to one consistant format

Change-Id: I848f2bf64376b4e9496d8f54ae52321a6c4a4314
remove deprecated assert_unicode sqlalchemy attribute

Removing this enables use with sqlalchemy 0.8.0
The deprecation is described upstream at:
http://docs.sqlalchemy.org/en/latest/changelog/changelog_08.html#change-ad44af79c886d1bb283042deb64f9cbe

Change-Id: I305bfdbcd3c3669c41318ea34115624f729b3909
Throw InvalidSnapshot for failed snap delete

When delete is called for a snapshot not in the "available" or
"error" state, throw an InvalidSnapshot exception rather than
InvalidVolume.

Change-Id: I47f55b3357d75b5c0c9a704aaf693f4764fd112c
Add availability_zone to the volume and snapshot notifications

Change-Id: I27b6dde68a1618a02c2309f007ead9dd1f04879e
Remove InvalidPortRange exception

The InvalidPortRange exception seems to be left over from the
initial split from Nova.

Change-Id: Ife03ac70f6ba80273c1c21e8d2c509b480a6fe80