Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next
diff --git a/core/store/dist/pom.xml b/core/store/dist/pom.xml
index 577376a..2451955 100644
--- a/core/store/dist/pom.xml
+++ b/core/store/dist/pom.xml
@@ -51,6 +51,15 @@
<groupId>de.javakaffee</groupId>
<artifactId>kryo-serializers</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.6</version>
+ </dependency>
</dependencies>
<build>
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/package-info.java b/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/package-info.java
index b2fc91d..aa644db 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/package-info.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/package-info.java
@@ -1,4 +1,4 @@
/**
- * Implementation of device store using distributed structures.
+ * Implementation of device store using distributed distributed p2p synchronization protocol.
*/
-package org.onlab.onos.store.device.impl;
+package org.onlab.onos.store.device.impl;
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5cf67de..16ca891 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,12 @@
<dependency>
<groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>4.0.23.Final</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<version>3.9.0.Final</version>
</dependency>