Updated openstack/openstack
Project: openstack/tempest  68929b87231c16acbdc78b721104caf8fb87c5a5
null
port test_server_rescue into v3 part1

This changeset only copies the v2 files into the appropriate v3
directories unchanged. This is being tried in order to make
reviewing of the porting easier as gerrit will display only what
is actually changed for v3 rather than entirely new files.

Partially implements blueprint nova-v3-api-tests

Change-Id: I11e258e3f257348e74b4cf4d900c3f9b292e2539
Updated openstack/openstack
Project: openstack/neutron  e3b9805939cc3a52921705bb94374bf12d032e68
null
Fix a typo in log exception in the metering agent

This patch fixes a typo when there is a exception
when the agent try to invoke a method of the driver.

Change-Id: I4fcf19fa84f178348abfb3563bbfd52f0dfcc095
Closes-bug: #1256041