diff options
| author |   Michal Skalski <mskalski@mirantis.com> | 2016-06-29 09:28:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-29 09:28:20 +0000 |
| commit | 968be12920f42828632b41594ec25940bb4e4213 (patch) | |
| tree | 5d27f1e2ffa2db29afb9dd8b19ca5e3fe6338d4f | |
| parent | 9fb25d41bd6487e3e34529381d35493ef67bec85 (diff) | |
| parent | b24f6facf80663041dc1c0d298e9f01fdd81f93e (diff) | |
Merge "Use openjdk-8-jre by default"
| -rw-r--r-- | build/f_isoroot/f_odlpluginbuild/config.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk index 876998cd9..e02da2bf9 100644 --- a/build/f_isoroot/f_odlpluginbuild/config.mk +++ b/build/f_isoroot/f_odlpluginbuild/config.mk @@ -8,14 +8,12 @@ ############################################################################## ODL_BRANCH ?= master -ODL_CHANGE ?= 1c8443ffc64af120337740551307378d1c21535d +ODL_CHANGE ?= 8eb70403e009f1a1f5ea3d2a027165139029d597 ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.git FPB_BRANCH ?= master FPB_CHANGE ?= 82191ca16b40021e445e854fad37c65cd8e70b0c FPB_REPO ?= https://github.com/openstack/fuel-plugins -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/groups/public/org/opendaylight/integration/distribution-karaf/0.4.2-Beryllium-SR2/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz export ODL_VERSION_NUMBER?=0.4.2 |