resolve conflicts after upstream merge
resolve conflicts after upstream merge
CiscoSystems/nova,Stavitsky/nova,mandeepdhami/nova,shail2810/nova,eayunstack/nova,bigswitch/nova,savi-dev/nova,blueboxgroup/nova,leilihh/nova,psiwczak/openstack,MountainWei/nova,kimjaejoong/nova,rrader/nova-docker-plugin,zzicewind/nova,josephsuh/extra-specs,bclau/nova,fajoy/nova,petrutlucian94/nova_dev,devoid/nova,dawnpower/nova,cloudbau/nova,rickerc/nova_audit,zaina/nova,TwinkleChawla/nova,LoHChina/nova,angdraug/nova,NewpTone/stacklab-nova,josephsuh/extra-specs,dstroppa/openstack-smartos-nova-grizzly,barnsnake351/nova,BeyondTheClouds/nova,BeyondTheClouds/nova,raildo/nova,KarimAllah/nova,ruslanloman/nova,maoy/zknova,Yusuke1987/openstack_template,SUSE-Cloud/nova,sridevikoushik31/openstack,shootstar/novatest,petrutlucian94/nova_dev,OpenAcademy-OpenStack/nova-scheduler,NewpTone/stacklab-nova,rickerc/nova_audit,russellb/nova,nikesh-mahalka/nova,double12gzh/nova,badock/nova,usc-isi/extra-specs,sacharya/nova,rahulunair/nova,akash1808/nova_test_latest,mahak/nova,houshengbo/nova_vmware_compute_driver,redhat-openstack/nova,rajalokan/nova,Juniper/nova,eharney/nova,maheshp/novatest,Juniper/nova,ntt-sic/nova,berrange/nova,gooddata/openstack-nova,Triv90/Nova,mandeepdhami/nova,petrutlucian94/nova,TieWei/nova,salv-orlando/MyRepo,savi-dev/nova,phenoxim/nova,cloudbase/nova-virtualbox,leilihh/novaha,BeyondTheClouds/nova,Juniper/nova,cloudbau/nova,plumgrid/plumgrid-nova,adelina-t/nova,Metaswitch/calico-nova,openstack/nova,cloudbase/nova,cloudbase/nova,spring-week-topos/nova-week,yatinkumbhare/openstack-nova,CiscoSystems/nova,paulmathews/nova,qwefi/nova,takeshineshiro/nova,sridevikoushik31/nova,vmturbo/nova,JioCloud/nova_test_latest,Tehsmash/nova,jianghuaw/nova,eonpatapon/nova,angdraug/nova,tangfeixiong/nova,joker946/nova,devendermishrajio/nova,isyippee/nova,yrobla/nova,alvarolopez/nova,KarimAllah/nova,double12gzh/nova,j-carpentier/nova,russellb/nova,alaski/nova,hanlind/nova,zhimin711/nova,tealover/nova,NewpTone/stacklab-nova,Tehsmash/nova,noironetworks/nova,plumgrid/plumgrid-nova,eonpatapon/nova,Yuriy-Leonov/nova,TieWei/nova,orbitfp7/nova,adelina-t/nova,redhat-openstack/nova,nikesh-mahalka/nova,qwefi/nova,aristanetworks/arista-ovs-nova,cyx1231st/nova,dawnpower/nova,sebrandon1/nova,NoBodyCam/TftpPxeBootBareMetal,tianweizhang/nova,shahar-stratoscale/nova,Yusuke1987/openstack_template,rajalokan/nova,blueboxgroup/nova,scripnichenko/nova,orbitfp7/nova,shootstar/novatest,apporc/nova,citrix-openstack-build/nova,affo/nova,mgagne/nova,Juniper/nova,projectcalico/calico-nova,petrutlucian94/nova,belmiromoreira/nova,luogangyi/bcec-nova,mgagne/nova,mmnelemane/nova,ted-gould/nova,salv-orlando/MyRepo,whitepages/nova,OpenAcademy-OpenStack/nova-scheduler,sridevikoushik31/nova,bigswitch/nova,DirectXMan12/nova-hacking,silenceli/nova,Francis-Liu/animated-broccoli,sileht/deb-openstack-nova,felixma/nova,cloudbase/nova,cernops/nova,sacharya/nova,badock/nova,zaina/nova,mahak/nova,maoy/zknova,sridevikoushik31/openstack,maelnor/nova,eayunstack/nova,tanglei528/nova,thomasem/nova,rahulunair/nova,russellb/nova,alaski/nova,usc-isi/extra-specs,eharney/nova,CloudServer/nova,leilihh/novaha,openstack/nova,MountainWei/nova,josephsuh/extra-specs,gooddata/openstack-nova,yrobla/nova,psiwczak/openstack,sileht/deb-openstack-nova,CloudServer/nova,whitepages/nova,edulramirez/nova,Francis-Liu/animated-broccoli,thomasem/nova,sileht/deb-openstack-nova,alexandrucoman/vbox-nova-driver,saleemjaveds/https-github.com-openstack-nova,watonyweng/nova,vmturbo/nova,akash1808/nova,usc-isi/nova,eneabio/nova,raildo/nova,gspilio/nova,j-carpentier/nova,maelnor/nova,DirectXMan12/nova-hacking,saleemjaveds/https-github.com-openstack-nova,Brocade-OpenSource/OpenStack-DNRM-Nova,vmturbo/nova,shail2810/nova,paulmathews/nova,sebrandon1/nova,fajoy/nova,gspilio/nova,vmturbo/nova,alexandrucoman/vbox-nova-driver,devendermishrajio/nova_test_latest,belmiromoreira/nova,JioCloud/nova_test_latest,salv-orlando/MyRepo,gooddata/openstack-nova,aristanetworks/arista-ovs-nova,viggates/nova,tudorvio/nova,Brocade-OpenSource/OpenStack-DNRM-Nova,fnordahl/nova,mikalstill/nova,usc-isi/extra-specs,sebrandon1/nova,ruslanloman/nova,mikalstill/nova,imsplitbit/nova,jianghuaw/nova,silenceli/nova,viggates/nova,hanlind/nova,tanglei528/nova,jianghuaw/nova,JioCloud/nova,SUSE-Cloud/nova,houshengbo/nova_vmware_compute_driver,vladikr/nova_drafts,akash1808/nova,felixma/nova,klmitch/nova,eneabio/nova,shahar-stratoscale/nova,maoy/zknova,usc-isi/nova,mikalstill/nova,cyx1231st/nova,bclau/nova,luogangyi/bcec-nova,iuliat/nova,zzicewind/nova,DirectXMan12/nova-hacking,usc-isi/nova,dims/nova,ewindisch/nova,klmitch/nova,tealover/nova,klmitch/nova,gspilio/nova,paulmathews/nova,NeCTAR-RC/nova,leilihh/nova,fnordahl/nova,tudorvio/nova,CCI-MOC/nova,NoBodyCam/TftpPxeBootBareMetal,houshengbo/nova_vmware_compute_driver,CCI-MOC/nova,Triv90/Nova,LoHChina/nova,eneabio/nova,phenoxim/nova,gooddata/openstack-nova,rrader/nova-docker-plugin,berrange/nova,Triv90/Nova,openstack/nova,hanlind/nova,mmnelemane/nova,iuliat/nova,yatinkumbhare/openstack-nova,virtualopensystems/nova,isyippee/nova,jeffrey4l/nova,ewindisch/nova,takeshineshiro/nova,Yuriy-Leonov/nova,jeffrey4l/nova,yrobla/nova,zhimin711/nova,ted-gould/nova,bgxavier/nova,dims/nova,joker946/nova,varunarya10/nova_test_latest,varunarya10/nova_test_latest,devendermishrajio/nova_test_latest,rahulunair/nova,barnsnake351/nova,noironetworks/nova,sridevikoushik31/openstack,affo/nova,dstroppa/openstack-smartos-nova-grizzly,JioCloud/nova,Metaswitch/calico-nova,dstroppa/openstack-smartos-nova-grizzly,sridevikoushik31/nova,maheshp/novatest,akash1808/nova_test_latest,klmitch/nova,devoid/nova,NeCTAR-RC/nova,yosshy/nova,virtualopensystems/nova,psiwczak/openstack,alvarolopez/nova,NoBodyCam/TftpPxeBootBareMetal,watonyweng/nova,maheshp/novatest,bgxavier/nova,apporc/nova,tianweizhang/nova,devendermishrajio/nova,edulramirez/nova,CEG-FYP-OpenStack/scheduler,kimjaejoong/nova,projectcalico/calico-nova,spring-week-topos/nova-week,rajalokan/nova,KarimAllah/nova,CEG-FYP-OpenStack/scheduler,citrix-openstack-build/nova,JianyuWang/nova,rajalokan/nova,cernops/nova,imsplitbit/nova,tangfeixiong/nova,Stavitsky/nova,savi-dev/nova,JianyuWang/nova,aristanetworks/arista-ovs-nova,scripnichenko/nova,cernops/nova,jianghuaw/nova,sridevikoushik31/nova,vladikr/nova_drafts,fajoy/nova,mahak/nova,TwinkleChawla/nova,yosshy/nova,ntt-sic/nova,cloudbase/nova-virtualbox