Updated openstack/openstack
Project: openstack/ceilometer  b5226f499b7e359aabcbac5edf5816998e6e0af8
null
Replace mox with mock in energy and objectstore

Replace mox with mock in:

* tests.energy.test_kwapi
* tests.objectstore.test_swift
* tests.objectstore.test_swift_middleware

Change-Id: If1168c6a4884f4a01f33587a14e60ccb3819dbd1
Updated openstack/openstack
Project: openstack/nova  b0263d7e8c041abea16b963b3137959773a46198
null
Adds XML namespace example for disk config extension

Adds XML namespace and specifying of the disk config value
to the disk config extensions api sample test data for server
creation. This is being done so the api samples used by the
documentation contain the example of this usage.

DocImpact

Change-Id: Icd7aa3743f71dd1cb8575605e5f1ce5da6bd37bf
Closes-Bug: 1189817