From: Tony Tkacik <ttkacik@cisco.com>
Date: Tue, 20 May 2014 13:11:24 +0000 (+0000)
Subject: Merge "BUG-1018 Implement BackwardsCompatible BI broker data notifications"
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~58
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=b78e63501576638e1f000fd46663f8c42340f9e2

Merge "BUG-1018 Implement BackwardsCompatible BI broker data notifications"
---

b78e63501576638e1f000fd46663f8c42340f9e2
diff --cc opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java
index 89274c9ad5,feeab1a4b7..1839de1597
--- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java
+++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java
@@@ -25,10 -27,12 +27,12 @@@ import org.opendaylight.controller.netc
  import org.opendaylight.controller.netconf.client.conf.NetconfClientConfigurationBuilder;
  import org.opendaylight.controller.netconf.client.conf.NetconfReconnectingClientConfiguration;
  import org.opendaylight.controller.netconf.client.conf.NetconfReconnectingClientConfigurationBuilder;
 -import org.opendaylight.controller.netconf.util.handler.ssh.authentication.LoginPassword;
 +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.authentication.LoginPassword;
  import org.opendaylight.controller.sal.binding.api.data.DataProviderService;
+ import org.opendaylight.controller.sal.connect.netconf.InventoryUtils;
  import org.opendaylight.controller.sal.connect.netconf.NetconfDevice;
  import org.opendaylight.controller.sal.connect.netconf.NetconfDeviceListener;
+ import org.opendaylight.controller.sal.core.api.data.DataChangeListener;
  import org.opendaylight.protocol.framework.ReconnectStrategy;
  import org.opendaylight.protocol.framework.ReconnectStrategyFactory;
  import org.opendaylight.protocol.framework.TimedReconnectStrategy;