summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-08-25 20:58:45 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-25 20:58:45 +0000
commitd9c86c5b1cb3f4641ea29f7671dd3050556b5773 (patch)
tree9cbb7ccaf3b3b5e82970a425e511eb971825f116
parent112f5a5395f0efef8b9118f7a0302bb62997ca11 (diff)
parent2cf867da59ff387eb4b1fed7ff41a54b98d10c88 (diff)
Merge "Rebase: Account for ODL plugin upstream changes" into stable/colorado
-rw-r--r--patches/fuel-plugin-opendaylight/0001-ODL-leveldb-leveldbjni-Enable-arm64-support.patch2
1 files changed, 1 insertions, 1 deletions
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 05405124..d8fe07da 100644
--- 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