From: Ed Warnicke Date: Wed, 15 Jan 2014 21:15:02 +0000 (+0000) Subject: Merge "Add ietf-topology to yangstore blacklist." X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~84 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=d575edf655b58bb5aafd88c113ace7d41a813d7c;hp=82c8b8d0a8584735a02146b437f38ebdaebd9194 Merge "Add ietf-topology to yangstore blacklist." --- diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini index dccb267f3a..6a219c514a 100644 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini +++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini @@ -46,8 +46,7 @@ netconf.config.persister.2.storageAdapterClass=org.opendaylight.controller.confi netconf.config.persister.2.properties.fileStorage=configuration/current/controller.currentconfig.xml netconf.config.persister.2.properties.numberOfBackups=1 - -yangstore.blacklist=.*controller.model.* +yangstore.blacklist=.*controller.model.*|.*ietf-topology # Set Default start level for framework osgi.bundles.defaultStartLevel=4