Silly mistake when resolving merge conflict...fixed
Silly mistake when resolving merge conflict...fixed
tanglei528/glance,dims/glance,openstack/glance,stevelle/glance,openstack/glance,rickerc/glance_audit,akash1808/glance,sigmavirus24/glance,rajalokan/glance,dims/glance,wkoathp/glance,kfwang/Glance-OVA-OVF,JioCloud/glance,stevelle/glance,jumpstarter-io/glance,kfwang/Glance-OVA-OVF,takeshineshiro/glance,saeki-masaki/glance,citrix-openstack-build/glance,rickerc/glance_audit,cloudbau/glance,ntt-sic/glance,ozamiatin/glance,scripnichenko/glance,vuntz/glance,rajalokan/glance,openstack/glance,jumpstarter-io/glance,vuntz/glance,tanglei528/glance,klmitch/glance,sigmavirus24/glance,cloudbau/glance,redhat-openstack/glance,SUSE-Cloud/glance,ozamiatin/glance,darren-wang/gl,scripnichenko/glance,saeki-masaki/glance,SUSE-Cloud/glance,ntt-sic/glance,paramite/glance,citrix-openstack-build/glance,darren-wang/gl,klmitch/glance,redhat-openstack/glance,takeshineshiro/glance,JioCloud/glance,wkoathp/glance,akash1808/glance,paramite/glance