Code Review / armband.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: bbf9386)
Rebase: Account for ODL plugin upstream changes 79/19579/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Thu, 25 Aug 2016 11:13:25 +0000 (13:13 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Thu, 25 Aug 2016 11:18:13 +0000 (11:18 +0000)
Change-Id: I854bedd7dd61cf10239f8592336a86b92d78d0bc
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 0ef09dd55010b86fd5cc709cb9520e1a9d686c12)

patches/fuel-plugin-opendaylight/0001-ODL-leveldb-leveldbjni-Enable-arm64-support.patch patch | blob | history

diff --git a/patches/fuel-plugin-opendaylight/0001-ODL-leveldb-leveldbjni-Enable-arm64-support.patch b/patches/fuel-plugin-opendaylight/0001-ODL-leveldb-leveldbjni-Enable-arm64-support.patch
index 0540512..d8fe07d 100644 (file)
--- a/patches/fuel-plugin-opendaylight/0001-ODL-leveldb-leveldbjni-Enable-arm64-support.patch
+++ b/patches/fuel-plugin-opendaylight/0001-ODL-leveldb-leveldbjni-Enable-arm64-support.patch
@@ -322,6 +322,6 @@ index 3706678..841bfee 100644
      puppet_modules: puppet/modules:/etc/puppet/modules
 -    timeout: 720
 +    timeout: 3600
+
  - id: netconfig
    type: puppet
-   version: 2.0.0