Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Integrate MRI projects for Neon
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
resources
/
org
/
opendaylight
/
blueprint
/
clustered-datastore.xml
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/resources/org/opendaylight/blueprint/clustered-datastore.xml
b/opendaylight/md-sal/sal-distributed-datastore/src/main/resources/org/opendaylight/blueprint/clustered-datastore.xml
index e0153cbaae07bcb1d3cc23c346f852d59f6a33f3..0c3e5da9ceeb76a642d0bfcd55ba4fcf9b99831c 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/resources/org/opendaylight/blueprint/clustered-datastore.xml
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/resources/org/opendaylight/blueprint/clustered-datastore.xml
@@
-153,7
+153,7
@@
<service ref="clusteredDOMDataBroker" interface="org.opendaylight.mdsal.dom.api.DOMDataBroker"
odl:type="default"/>
<service ref="clusteredDOMDataBroker" interface="org.opendaylight.mdsal.dom.api.DOMDataBroker"
odl:type="default"/>
- <bean id="legacyDOMDataBroker" class="org.opendaylight.controller.
cluster.databroker
.compat.LegacyDOMDataBrokerAdapter">
+ <bean id="legacyDOMDataBroker" class="org.opendaylight.controller.
sal.core
.compat.LegacyDOMDataBrokerAdapter">
<argument ref="clusteredDOMDataBroker"/>
</bean>
<argument ref="clusteredDOMDataBroker"/>
</bean>
@@
-173,7
+173,6
@@
<argument ref="listenableFutureExecutor"/>
<argument value="CommitFutureExecutorStats"/>
<argument value="DOMDataBroker"/>
<argument ref="listenableFutureExecutor"/>
<argument value="CommitFutureExecutorStats"/>
<argument value="DOMDataBroker"/>
- <argument><null/></argument>
</bean>
<!-- Distributed EntityOwnershipService -->
</bean>
<!-- Distributed EntityOwnershipService -->