summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2016-04-06 20:35:10 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-04-06 20:35:10 +0000
commit4414d39225fa7ea386d86ea36abe67e6bed12c01 (patch)
treec4247adc953d4d52bfc8a3ceb4c4928e741823c8
parente7a78baae49f02b4303b6204eea7de01c527744c (diff)
parentb431b46f15275e6b0718fc1d641b7c38f1606055 (diff)
Merge "Use Opendaylight_SR-1" into stable/brahmaputra
-rw-r--r--build/f_isoroot/f_odlpluginbuild/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
index 5287ca8aa..e8afd4a9b 100644
--- a/build/f_isoroot/f_odlpluginbuild/Makefile
+++ b/build/f_isoroot/f_odlpluginbuild/Makefile
@@ -8,13 +8,13 @@
##############################################################################
TOP := $(shell pwd)
-ODL_BRANCH=brahmaputra-release
+ODL_BRANCH=brahmaputra-sr2
ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git"
export USE_JAVA8=true
export JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb
-export ODL_TARBALL_LOCATION=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium/distribution-karaf-0.4.0-Beryllium.tar.gz
-
+export ODL_TARBALL_LOCATION=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz
+export ODL_VERSION_NUMBER=0.4.1
.PHONY: all
all: .odlbuild