Updated openstack/openstack
Project: openstack/nova  66f2db53460520019c6845be7f2997d6769dfe0d
null
VMware: fix regression attaching iscsi cinder volumes

VMware drivers fail to attach a iSCSI backed cinder volume with an
error 'unable to find iscsi targets' because the underlying
retrieval api was updated to a newer version but not it's usage in
volume_util (see commit e331287cdd1300878bfb9bbb3630889370e5fa72).
This is a regression over Grizzly release.

Fixes: bug #1193980

(cherry picked from commit e70211ff89785fed6a868eaab723847833590502)

Change-Id: I14fe62ad98fd9161df3ce6c06160b2759a9e38b2
Updated openstack/openstack
Project: openstack/nova  6e50dbdc2521ddf87bafd6fb2c6d1cc847ede5ad
null
Fixes inconsistency in flavors list with marker

Flavors list with marker is supposed to use flavorid as the marker since this is
the only id attribute the users can see, but it was using id (the confusion was
probably caused by the fact that flavorid attribute shows up to the user as id).

The change on db unit test shows makes the bug evident, and justify the changes
on the filter_by criteria.

Fixes bug 1226698

Change-Id: I3ffa636febb63be796fffc94be6486bf74e8239b
(cherry picked from commit c2c0958ad768581cd0e92f88207430227cb6539a)