Merge changes If7159c39,I6c84b2fe

* changes:
  Deprecate ForwardedBackwardsCompatibleDataBroker
  Migrate from using the deprecated SchemaContextProvider

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index f61094ab48c501beb2a8d77b55faf06217d44a0f..b2585adb04908ab7a3ba69419bb45374ff13ef1c 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -71,7 +71,7 @@
     <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
     <config.clustering.configfile>05-clustering.xml</config.clustering.configfile>
     <config.netty.configfile>00-netty.xml</config.netty.configfile>
-    <config.mdsal.configfile>01-mdsal.xml</config.mdsal.configfile>
+    <config.mdsal.configfile>01-md-sal.xml</config.mdsal.configfile>
     <config.xsql.configfile>04-xsql.xml</config.xsql.configfile>
     <config.netconf.client.configfile>01-netconf.xml</config.netconf.client.configfile>
     <config.toaster.configfile>03-toaster-sample.xml</config.toaster.configfile>