Merge changes I426a2bc1,I5440b866

* changes:
  Bug 6291 - Fix bugs of new Restconf 11 implementation
  Bug 5909 - PATCH does not report 409 on OptimisticLockFailedException

diff --git a/netconf/netconf-topology-config/src/main/resources/initial/02-clustered-netconf-topology.xml b/netconf/netconf-topology-config/src/main/resources/initial/02-clustered-netconf-topology.xml
index 39bc8541b74aebdad1f3d23b47848a636671c4f8..ded67f5ae6529f5135db171490b3cea75c779047 100644 (file)
--- a/netconf/netconf-topology-config/src/main/resources/initial/02-clustered-netconf-topology.xml
+++ b/netconf/netconf-topology-config/src/main/resources/initial/02-clustered-netconf-topology.xml
@@ -68,7 +68,9 @@
     <required-capabilities>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:netconf:topology?module=netconf-topology&amp;revision=2015-07-27</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:clustered:netconf:topology?module=clustered-netconf-topology&amp;revision=2015-11-04</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:distributed-entity-ownership-service?module=distributed-entity-ownership-service&amp;revision=2015-08-10</capability>
+        <capability>
+            urn:opendaylight:params:xml:ns:yang:controller:config:legacy-entity-ownership-service-provider?module=opendaylight-legacy-entity-ownership-service-provider&amp;revision=2016-02-26
+        </capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:config:actor-system-provider:service?module=actor-system-provider-service&amp;revision=2015-10-05</capability>
     </required-capabilities>
 </snapshot>
\ No newline at end of file