merging parent branch lp:~bcwaldon/nova/osapi-flavors-1_1
merging parent branch lp:~bcwaldon/nova/osapi-flavors-1_1
rajarammallya/melange,rajarammallya/melange,rackerlabs/melange,rajarammallya/melange,rackerlabs/melange,rackerlabs/melange,openstack-attic/melange,openstack-attic/melange,openstack-attic/melange