Updated openstack/openstack
Project: openstack/cinder  5147e79800960a1eda15cb8dd4222767af26f741
null
3PAR: Raise Ex when del snapshot with depend vol

Deleting a 3PAR snapshot can result in an HTTP Conflict error message,
such as when a volume is dependent on it.
Previously, this exception was not caught, and the state was set
to "Error_Deleting" with no recovery path.
The code was updated to catch this exception and raise a
SnapShotIsBusy exception with an appropriate error message.
The state reverts back to 'Available' allowing the user to try again
after removing the dependency.

Change-Id: Ibe8c5d581af10c85397c37993c49f8fc3bce8620
Closes-Bug: #1250249
Updated openstack/openstack
Project: openstack/horizon  b2eec27e4594374a81f73cf954187be73331e7a2
null
Replace asserts in __init__ files with __all__

Defines __all__ in place of assert statements in the __init__.py files.

Change-Id: I0e871789d012e3ec579a8563a61d7ae32e20ed96
Closes-bug: #1251546