summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch
diff options
context:
space:
mode:
authorStanislaw Kardach <kda@semihalf.com>2016-03-29 14:42:46 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-02 14:15:59 +0000
commit6398937dfe68ad9c7ce2133c866edb6a7bd69b32 (patch)
treee72adfd031bb09477d36723cd77609536a9f5fa3 /patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch
parent24428f3c202e3b889114915d06ddb1178369c117 (diff)
Rebase patches and fix importing
* We were missing the patch rebase changes that were introduced by gerrit automatic upstream project update for submodules. This patch introduces them. * Apply all submodule patches a single `git am` call to help with rebasing patches. * Correct Opendaylight plugin initialization in repo config. Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> (cherry picked from commit ccf57699bbff183ef45fd4a4e94df094ca69ee87) Change-Id: I88be0617196bc77cf237a9818f7368f6eb78f6b3
Diffstat (limited to 'patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch')
-rw-r--r--patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch
index dd043892..61ba7e3c 100644
--- a/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch
+++ b/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch
@@ -8,7 +8,7 @@ Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
-index b0bc9c7..cc305e0 100644
+index 3ecf680..b0449d0 100644
--- a/build/f_isoroot/f_odlpluginbuild/Makefile
+++ b/build/f_isoroot/f_odlpluginbuild/Makefile
@@ -8,8 +8,8 @@