Updated openstack/openstack
Project: openstack/keystone  a120f251d0ccba90803952ccf6099e86334c4df9
null
Fix issue deleting ec2-credentials as non-admin user

The ec2tokens controller incorrectly uses the access id, not the
hashed credential id in _assert_owner, which means that non-admin
users can't delete their ec2-credentials.  Adding the hashing, as
in _get_credentials fixes the problem.  Test added demonstrating
the issue.

Change-Id: Ifb6e3e10a50541cf21d25880bd74e9aeb6df4f26
Closes-Bug: #1245435
(cherry picked from commit 85ca6ac8a7fab14c659673ddf47777badcbcbf04)
Updated openstack/openstack
Project: openstack/ceilometer  0ab6a119bfae78f124a9a2e010c4c54fb05fc839
null
Checks for presence of Hyper-V cpu metrics before accessing

Adds a default value if there are no cpu metrics to be retrieved.

Closes-Bug: 1249959
(cherry picked from commit f15e2cc9248c99e9b5c6b371ecce4f0ed49450cc)

Change-Id: I39513648ab25d46b2639b24a94e7344954ce3aeb