From: Jakub Morvay Date: Wed, 8 Jun 2016 13:42:46 +0000 (+0200) Subject: BUG 5932 - Remove NETCONF property X-Git-Tag: release/boron~141 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=4337f3aae163aef40e54bcd05243a252d9a9f48b BUG 5932 - Remove NETCONF property Remove netconf.ssh.pk.path property from controller etc/custom.properties file. It is netconf's project responsibility to manage its own properties. Needs to be merged after https://git.opendaylight.org/gerrit/#/c/39941/ Change-Id: Ib4d882c911682cc8a6844511c935f89aeddbced6 Signed-off-by: Jakub Morvay --- diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties b/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties index 71b975d8a6..9a0843c131 100644 --- a/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties +++ b/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties @@ -13,8 +13,6 @@ org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true # Use Equinox as default OSGi Framework Implementation karaf.framework=equinox -# Use Linux style path -netconf.ssh.pk.path = ./configuration/RSA.pk # Set security provider to BouncyCastle org.apache.karaf.security.providers = org.bouncycastle.jce.provider.BouncyCastleProvider