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