Updated openstack/openstack
Project: openstack/nova  b4707c83e53dd268bc53c3843f04110a22413908
null
Fix: Unshelving an instance uses original image

The driver uses the property image_ref to boot the
the instance.
This patch updates the image_ref property with the
shelved_image_id stored during the shelving.

Change-Id: I3bba0a230044613e07122a6d122597e5b8d43438
Closes-Bug: #1257594
Updated openstack/openstack
Project: openstack/nova  e7e0e955c0bd56470f4f3ead94c7f1baea54f287
null
Fix compute_node stats

The compute_node object has several issues with the stats field
that are cleaned up by this patch, including the following:

- obj_make_compatible() should check the stats property exists
  before attempting to delete it
- from_db_object() should not create the stats property if it
  is not in the database field (it is a nullable field)
- create() should convert the stats property to its database
  field format if it is present
- tests for create() and save() should check that the database
  format conversion is done

This method does not change any fields so there is no change to
the object's version.

Change-Id: I5c68994d618f0ecf9409c37321bc87a006c431ac