Merge branch 'master' into kilo

1 files changed, 4 insertions, 4 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb
index b1d97c4..dd6d0ef 100644
--- a/meta-openstack/recipes-devtools/python/python-glance_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb
@@ -7,15 +7,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 PR = "r0"
 SRCNAME = "glance"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
            file://glance.init \
-           file://glance-change-builtin-tests-config-location.patch \
            "
 
 # removed. juno uses store library: file://0001-glance-store-only-load-known-stores-not-all-stores.patch
+#                                   file://glance-change-builtin-tests-config-location.patch
 
-SRCREV="c5e302ef220803b6c86d588ddcff9a63eaaaccc2"
-PV="2014.2+git${SRCPV}"
+SRCREV="c84d8c98bc0dd64d79bd1e659b9561d47b3428c1"
+PV="2015.1.0b2+git${SRCPV}"
 
 S = "${WORKDIR}/git"