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