Merge proposals dependent on lp://qastaging/~gnuoy/python-novaclient/juno-update-deps

lp://qastaging/~gnuoy/python-novaclient/juno-update-deps has no merge proposals.