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