Merge "Bug 1894: Add LISP configuration options to etc/custom.properties in Karaf"
authorMadhu Venugopal <mavenugo@gmail.com>
Tue, 16 Sep 2014 17:49:02 +0000 (17:49 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 16 Sep 2014 17:49:02 +0000 (17:49 +0000)

Trivial merge