Merge "BUG-1618 Handle pending writes in ssh netconfclient"

[controller.git] / opendaylight / md-sal / pom.xml

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 02fbde8f1826648b12278311fb3defe1e72c1347..c184c44d7d0fae3661632e3a3bb77f1d86ff879e 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -66,8 +66,11 @@
     <!--InMemory DOM DataStore-->
     <module>sal-inmemory-datastore</module>
 
-    <!--sal-protocolbuffer-encoding-->
-    <module>sal-protocolbuffer-encoding</module>
+    <!--sal-protocolbuffer-encoding is now part of sal-clutering-commons-->
+    <module>sal-clustering-commons</module>
+
+    <!-- sal clustering configuration -->
+    <module>sal-clustering-config</module>
 
     <!-- sal-distributed-datastore -->
     <module>sal-distributed-datastore</module>
@@ -80,6 +83,7 @@
 
     <!-- Clustering -->
     <module>sal-remoterpc-connector</module>
+    <module>sal-dom-xsql-config</module>
   </modules>
 
   <build>
@@ -120,7 +124,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore></ignore>
+                    <ignore/>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -133,7 +137,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore></ignore>
+                    <ignore/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
@@ -213,4 +217,4 @@
       </modules>
     </profile>
   </profiles>
-</project>
+</project>
\ No newline at end of file