core: update to stable/juno release branches

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

10 files changed, 28 insertions, 27 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
index 0ab5874..48051dd 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 PR = "r0"
 SRCNAME = "ceilometer"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \
            file://ceilometer.conf \
            file://ceilometer.init \
            file://fix_ceilometer_memory_leak.patch \
@@ -16,8 +16,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
 #   file://ceilometer-builtin-tests-config-location.patch
 
 
-SRCREV="1c8e3dea7cf53b25f2b3ac4a06bcbc1787d6673b"
-PV="2014.2.rc1+git${SRCPV}"
+SRCREV="b1fca33e5f4c5443389d131a212a058d2306ac23"
+PV="2014.2+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 CEILOMETER_SECRET ?= "12121212"
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
index 7dfc283..4769a82 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 PR = "r0"
 SRCNAME = "cinder"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \
     file://cinder.conf \
     file://cinder.init \
     file://cinder-volume \
@@ -20,8 +20,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
     file://cinder-builtin-tests-config-location.patch \
         "
 
-SRCREV="37e4a12652c803d60c18079b735d96e5c7890f07"
-PV="2014.2.rc1+git${SRCPV}"
+SRCREV="7b1d7a31335bd8723551c9af5c270927ad830c3f"
+PV="2014.2+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 inherit setuptools update-rc.d identity default_configs hosts openstackchef monitor
diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb
index 932ca5d..f7ae43c 100644
--- a/meta-openstack/recipes-devtools/python/python-glance_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb
@@ -7,14 +7,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 PR = "r0"
 SRCNAME = "glance"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \
            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
 
-SRCREV="453706b4b3a3d6d9c3b154a1fde59c34fc30234b"
+SRCREV="c5e302ef220803b6c86d588ddcff9a63eaaaccc2"
 PV="2014.2+git${SRCPV}"
 
 S = "${WORKDIR}/git"
diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb
index f473338..dc989b5 100644
--- a/meta-openstack/recipes-devtools/python/python-heat_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 PR = "r0"
 SRCNAME = "heat"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \
            file://heat.conf \
            file://heat.init \
            file://autoscaling_example.template \
@@ -16,7 +16,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
            file://heat-tests-change-project_dir-path.patch \
 "
 
-SRCREV="2a91c1569d34b4e735e7cb2705b4cf663b3f5998"
+SRCREV="5664854f372b9810d040c615d8a678dbfdfb880e"
 PV="2014.2+git${SRCPV}"
 S = "${WORKDIR}/git"
 
diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
index 7969383..d7545c8 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
@@ -58,7 +58,7 @@ RDEPENDS_${PN} += " python-django \
 PR = "r3"
 SRCNAME = "horizon"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \
     file://horizon.init \
     file://fix_bindir_path.patch \
     file://openstack-dashboard-apache.conf \
@@ -66,8 +66,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
     file://horizon-use-full-package-path-to-test-directories.patch \
     "
 
-SRCREV="bb7fa11c7688c8d43b8fb71540d32f1908b8da5e"
-PV="2014.2.rc1+git${SRCPV}"
+SRCREV="ed895a181db0c75000cd0ef34ac0d769a295424c"
+PV="2014.2+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 inherit setuptools update-rc.d python-dir default_configs openstackchef monitor
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
index f71c222..5db4cc0 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 PR = "r2"
 SRCNAME = "keystone"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \
            file://keystone.conf \
            file://identity.sh \
            file://keystone \
@@ -18,8 +18,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
            file://wsgi-keystone.conf \
            "
 
-SRCREV="2b7fdb1ab5de54c2a610a0ee9fc635ddb81e7b38"
-PV="2014.2.rc1+git${SRCPV}"
+SRCREV="f54fa8fa56d3708d5ef5b0173d9f6e4dce7130f2"
+PV="2014.2+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
index 6f72b60..c29ccee 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 PR = "r1"
 SRCNAME = "neutron"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \
            file://neutron-server.init \
            file://neutron-agent.init \
            file://l3_agent.ini \
@@ -18,8 +18,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
            file://uuid_wscheck.patch \
            file://neutron-test-nec-plugin-extensions-location.patch \
           "
-SRCREV="49234a824c16164a56cbfbf644490d07bb22e241"
-PV="2014.2.rc1+git${SRCPV}"
+SRCREV="ad6fefcb4d4068b46b69284e277df6ab2ee30105"
+PV="2014.2+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index 929adff..6afe3bd 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -11,14 +11,15 @@ SRCNAME = "nova"
 
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \
            file://nova-add-migrate.cfg-to-the-MANIFEST.patch \
            file://nova-convert-path-from-relative-to-absolute.patch \
            file://nova-fix-location-to-doc-directory.patch \
            file://nova-fix-location-to-plugin-directory.patch \
            file://neutron-api-set-default-binding-vnic_type.patch \
-           file://websocketproxy-allow-empty-schemes-at-python-2.7.3.patch \
            "
+# restore post stable/juno:
+#           file://websocketproxy-allow-empty-schemes-at-python-2.7.3.patch
 
 SRC_URI += "file://nova-all \
             file://nova.init \
@@ -26,7 +27,7 @@ SRC_URI += "file://nova-all \
             file://nova.conf \
             file://openrc \
            "
-SRCREV="943f02f1a62f7eb131f62729d83d97ad431ee89f"
+SRCREV="9c3ec16576e2f7c9d5aff6e4b620d708e6636568"
 PV="2014.2+git${SRCPV}"
 
 S = "${WORKDIR}/git"
diff --git a/meta-openstack/recipes-devtools/python/python-swift_git.bb b/meta-openstack/recipes-devtools/python/python-swift_git.bb
index 935b9fb..de21ab6 100644
--- a/meta-openstack/recipes-devtools/python/python-swift_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-swift_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 PR = "r0"
 SRCNAME = "swift"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \
            file://proxy-server.conf \
            file://dispersion.conf \
            file://test.conf \
@@ -16,7 +16,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
            file://cluster.conf \
 "
 
-SRCREV="709187b54ff2e9b81ac53977d4283523ce16af38"
+SRCREV="4765537cba6a6970110953f11f4e1b419d0730d3"
 PV="2.2.0+git${SRCPV}"
 S = "${WORKDIR}/git"
 
diff --git a/meta-openstack/recipes-devtools/python/python-trove_git.bb b/meta-openstack/recipes-devtools/python/python-trove_git.bb
index bd2cac0..f705708 100755
--- a/meta-openstack/recipes-devtools/python/python-trove_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-trove_git.bb
@@ -7,12 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 PR = "r0"
 SRCNAME = "trove"
 
-SRC_URI = "git://github.com/openstack/trove.git;branch=master \
+SRC_URI = "git://github.com/openstack/trove.git;branch=stable/juno \
           file://trove-init \
           "
 
-SRCREV="cd31f3d6b0a9cc02af1c50c719f6936679332f7e"
-PV="2014.2.rc1+git${SRCPV}"
+SRCREV="6c4ea5b845a4d6d71d3d3786517b5b358c30f3ec"
+PV="2014.2+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 inherit update-rc.d setuptools identity hosts useradd default_configs