Updated openstack/openstack
Project: openstack/horizon  fd562ed0156d77b63c750a017f99058d1cfafa1e

Handle error from neutron extension check in Overview page

Previously some Neutron API calls in get_neutron_limits are outside
try/except and if an error occurs a traceback will be displayed.

Change-Id: I191aecbf3135ddac3b20dbc7e0f22b63aa3837f9
Closes-Bug: #1252878
Updated openstack/openstack
Project: openstack/cinder  7e57a36a3d3086b2f76d4b6daa9bffdb2a6cff19

NetApp NFS: Do not reference dst_img_local before assignment

This patch moves the assignment of the dst_img_local variable to before the
try/finally block that references it so that the finally block will have this
variable no matter where in the try block an error is raised.

Change-Id: Iab48b46559f18a3d6b044abe4bc3e615e7fee075
Closes-Bug: 1309047