summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-19 18:04:11 +0000
committerGerrit Code Review <review@openstack.org>2015-06-19 18:04:11 +0000
commit6dae3fb671219116bbecb2e9351ee894d2bef89e (patch)
treeb0af4dc425c9a818ba50b466694da7d5cc52e39f
parent33c0a7539564d64b53a7c878e9f6ff10b178ac98 (diff)
parented376c38ebe257e438875fd68077c61e45744aa9 (diff)
Merge "[stable/juno] Nail Manila branch and Manilaclient tag in Devstack" into stable/junojuno-eol
-rw-r--r--contrib/devstack/lib/manila4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/devstack/lib/manila b/contrib/devstack/lib/manila
index 444116c..a4b54b9 100644
--- a/contrib/devstack/lib/manila
+++ b/contrib/devstack/lib/manila
@@ -27,10 +27,10 @@ set +o xtrace
27MANILA_REPO_ROOT=openstack 27MANILA_REPO_ROOT=openstack
28MANILA_GIT_BASE=${MANILA_GIT_BASE:-https://github.com} 28MANILA_GIT_BASE=${MANILA_GIT_BASE:-https://github.com}
29MANILA_REPO=${MANILA_GIT_BASE}/${MANILA_REPO_ROOT}/manila.git 29MANILA_REPO=${MANILA_GIT_BASE}/${MANILA_REPO_ROOT}/manila.git
30MANILA_BRANCH=master 30MANILA_BRANCH="stable/juno"
31 31
32MANILACLIENT_REPO=${MANILA_GIT_BASE}/${MANILA_REPO_ROOT}/python-manilaclient.git 32MANILACLIENT_REPO=${MANILA_GIT_BASE}/${MANILA_REPO_ROOT}/python-manilaclient.git
33MANILACLIENT_BRANCH=master 33MANILACLIENT_BRANCH="refs/tags/1.0.1"
34 34
35# set up default directories 35# set up default directories
36MANILA_DIR=${MANILA_DIR:=$DEST/manila} 36MANILA_DIR=${MANILA_DIR:=$DEST/manila}