Updated openstack/openstack
Project: openstack/swift  53a79c96517ae18f46253244b338a925e4073cb8
null
Account for a platform difference in semaphores

On OS X (and probably other Operating Systems) it isn't possible to
introspect the value of a semaphore. Account for this by skipping a
test about this.

Change-Id: I97824f9fc4e36de4f7a62c8ce53865e6977dfdfe
Updated openstack/openstack
Project: openstack/nova  e8ed20681d89847efa131e65e904f517caf54d13
null
Bad except clauses order causes wrong text in http response

InstanceInvalidState is an ancestor class of InstanceIsLocked, so
we need to catch InstanceIsLocked first. Fix the test case to
ensure we get the right http response back

Change-Id: Id22b284d9b7da8db4161ad8703bea1702cb0b82e