Code Review / odlparent.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: 8a3ab1c) | patch
Update LISP config in default Karaf resources 42/50442/2
authorLorand Jakab <lojakab@cisco.com>
Fri, 13 Jan 2017 14:52:22 +0000 (16:52 +0200)
committerStephen Kitt <skitt@redhat.com>
Tue, 17 Jan 2017 17:45:22 +0000 (17:45 +0000)
commit04b950804367df4443cb59af766c6408b233325d
tree9461fd6e6c87b484c7b2750f07f3af493f6f6cc7tree | snapshot
parent8a3ab1c53e275238fc0933b8a78b304067de0ddecommit | diff
Update LISP config in default Karaf resources

The lisp.mappingOverwrite configuration option was removed in the LISP
code, and the new option lisp.mappingMerge was added. Update
etc/custom.properties accordingly.

Change-Id: Ifaf9888a36e2b5ac90e8c82122e8d4db96a02b18
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties diff | blob | history
odlparent