Updated openstack/openstack
Project: openstack/heat  6436aafac5bd3d43e847672840e841c779d322ba
null
Revert "Implement stack-locking for multi-engine support"

This is a short term backout until it gets fixed.

This reverts commit c30530f12663302869a8f2edf979e8a8bd33ed2d.
Closes-bug: #1250797

Change-Id: Ide1dc4a9d1469dee033e8bc08d8ab4da96f79fc0
Updated openstack/openstack
Project: openstack/ceilometer  63a832299d27124536e9409b4c11e4497c411b92
null
Replace mox with mock in tests.api.v2.test_compute

tests/api/v2/test_compute_duration_by_resource_scenarios.py

Change-Id: Iced06504b1ac292bc9be0397e92f68067c53f1e2