From: Tony Tkacik <ttkacik@cisco.com>
Date: Tue, 25 Nov 2014 08:53:14 +0000 (+0000)
Subject: Merge changes If7159c39,I6c84b2fe
X-Git-Tag: release/lithium~844
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=152891151a8e7c7b0905b4b530837e2538b2ce7b;hp=ab3c6ac018c860fd20e4d51b894f1c74d47697a4

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 f61094ab48..b2585adb04 100644
--- 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>