| commit | cc8b101e170338679a238bd8e5e33a7361280c35 | [log] [tgz] |
|---|---|---|
| author | Yuta HIGUCHI <y-higuchi@onlab.us> | Fri Jan 24 09:14:39 2014 -0800 |
| committer | Yuta HIGUCHI <y-higuchi@onlab.us> | Fri Jan 24 09:14:39 2014 -0800 |
| tree | c0378e7b8965936a4007d26835fa615692dababf | |
| parent | d1a0d4739cfadc71ef01c00ff6cb3f3bdacd5a38 [diff] [blame] |
Fix merge error
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/ParallelFlowDatabaseOperation.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/ParallelFlowDatabaseOperation.java index ec03d09..e9cafee 100644 --- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/ParallelFlowDatabaseOperation.java +++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/ParallelFlowDatabaseOperation.java
@@ -25,7 +25,7 @@ import net.onrc.onos.ofcontroller.util.FlowPath; import net.onrc.onos.ofcontroller.util.serializers.KryoFactory; -import com.esotericsoftware.kryo2.Kryo; +import com.esotericsoftware.kryo.Kryo; /** * Class for performing parallel Flow-related operations on the Database.