diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-04-17 15:13:52 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-04-17 15:19:58 +0200 |
| commit | f55f96c79945e3c6c6d0fe907f8520a9eacd2677 (patch) | |
| tree | 59f510e1b7fffd9e76ee2772cd3c2f90b3b36093 /patches/opnfv-fuel | |
| parent | bc97394b41507955e58793df6859882ebb540ee4 (diff) | |
Rebase after "Bugfix Broadcast Group".
While we're at if, fix whitespace errors in affected patches.
Change-Id: Ic14e3e13f9503ab4b9307e55c731825b8a33da3b
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 |