cinder: uprev to juno

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

2 files changed, 5 insertions, 5 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-cinder/cinder-builtin-tests-config-location.patch b/meta-openstack/recipes-devtools/python/python-cinder/cinder-builtin-tests-config-location.patch
index 53da893..1981a87 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder/cinder-builtin-tests-config-location.patch
+++ b/meta-openstack/recipes-devtools/python/python-cinder/cinder-builtin-tests-config-location.patch
@@ -13,10 +13,10 @@ Index: git/cinder/tests/conf_fixture.py
 ===================================================================
 --- git.orig/cinder/tests/conf_fixture.py
 +++ git/cinder/tests/conf_fixture.py
-@@ -43,7 +43,7 @@ def set_defaults(conf):
+@@ -43,7 +43,7 @@
      conf.set_default('iscsi_num_targets', 8)
      conf.set_default('connection', 'sqlite://', group='database')
-     conf.set_default('sqlite_synchronous', False)
+     conf.set_default('sqlite_synchronous', False, group='database')
 -    conf.set_default('policy_file', 'cinder/tests/policy.json')
 +    conf.set_default('policy_file', '%PYTHON_SITEPACKAGES_DIR%/cinder/tests/policy.json')
      conf.set_default(
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
index 0866dca..c648bae 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=stable/icehouse \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
     file://cinder.conf \
     file://cinder.init \
     file://cinder-volume \
@@ -20,8 +20,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/icehouse \
     file://cinder-builtin-tests-config-location.patch \
         "
 
-SRCREV="978b036a6467f7f6afb4419f92bf4fa7d1ff2347"
-PV="2014.1+git${SRCPV}"
+SRCREV="116f54dbf188a17b5e3dd966658e98bf19b8912b"
+PV="2014.2.b1+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 inherit setuptools update-rc.d identity default_configs