diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-04-17 14:44:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-04-17 14:44:40 +0000 |
| commit | 5569b8a7d32b33bdc0bf47d9d8567192605f15b6 (patch) | |
| tree | cf6663467fc96b904c9171b4a9c3068836b2ac39 /patches/opnfv-fuel | |
| parent | fa47cae0599281bf3ae3c8d7b4816b22d39e3583 (diff) | |
| parent | f55f96c79945e3c6c6d0fe907f8520a9eacd2677 (diff) | |
Merge "Rebase after "Bugfix Broadcast Group"."
Diffstat (limited to 'patches/opnfv-fuel')
| -rw-r--r-- | patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch | 2 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch b/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch index 496acf07..279ab914 100644 --- a/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch +++ b/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch @@ -147,7 +147,7 @@ index a9e74bc..0266e17 100755 + echo "Error - didn't find backup file for Packages for ${arch}!" + exit 1 + fi -+ ++ + if [ ! -f $REPO/dists/trusty/main/binary-${arch}/Packages.gz.backup ]; then + echo "Error - didn't find backup file for Packages.gz for ${arch}!" + exit 1 diff --git a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch index 8634687f..a444a493 100644 --- a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch +++ b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch @@ -16,10 +16,10 @@ index 4ebf519..86d7b76 100644 ############################################################################## -ODL_BRANCH=brahmaputra-sr2 --ODL_CHANGE=b876df2345bf8c785dceea74f4c271fdfcc9563c +-ODL_CHANGE=ec9474c1178e7451ec75f6e306ac84424a84a28a -ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git" +ODL_BRANCH:=brahmaputra-sr2 -+ODL_CHANGE:=b876df2345bf8c785dceea74f4c271fdfcc9563c ++ODL_CHANGE:=ec9474c1178e7451ec75f6e306ac84424a84a28a +ODL_REPO:="https://github.com/openstack/fuel-plugin-opendaylight.git" export USE_JAVA8=true |