From: Ed Warnicke <eaw@cisco.com>
Date: Wed, 20 Nov 2013 09:50:37 +0000 (+0000)
Subject: Merge "Add blacklist capability to yang-store-impl."
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~369
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=fe954f74f6528a556a1b90d20e26937c57bca98b;hp=-c;p=controller.git

Merge "Add blacklist capability to yang-store-impl."
---

fe954f74f6528a556a1b90d20e26937c57bca98b
diff --combined opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
index 817a300545,8347bf1e44..dacdd2546e
--- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
+++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
@@@ -14,7 -14,7 +14,7 @@@ osgi.bundles=
      reference\:file\:../lib/jersey-server-1.17.jar@2:start
  
  # Netconf startup configuration
 -netconf.tcp.address=127.0.0.1
 +netconf.tcp.address=0.0.0.0
  netconf.tcp.port=8383
  
  #netconf.tls.address=127.0.0.1
@@@ -23,6 -23,7 +23,7 @@@
  #netconf.tls.keystore.password=
  
  netconf.config.persister.storageAdapterClass=org.opendaylight.controller.netconf.persist.impl.NoOpStorageAdapter
+ yangstore.blacklist=.*controller.model.*
  
  # Set Default start level for framework
  osgi.bundles.defaultStartLevel=4