commit 6382e4c16985491f376da98772405dff8d4419d2
author Toshio Koide <t-koide@onlab.us> Tue Jun 18 15:00:22 2013 -0700
committer Toshio Koide <t-koide@onlab.us> Tue Jun 18 15:00:22 2013 -0700
tree c68edec33a335fa95390caa547a015189c9fc985
parent bfe9b924e0338eef903173095e38f1f96aa97f15
parent afd89dcc0b1797494ac146a9fc588176abf2cdae

Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONOS into dev2

Conflicts:
	src/main/java/net/onrc/onos/ofcontroller/core/internal/DeviceStorageImpl.java
	src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java
	src/main/java/net/onrc/onos/ofcontroller/core/internal/TopoLinkServiceImpl.java
	src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
	src/main/java/net/onrc/onos/ofcontroller/routing/TopoRouteService.java

src/main/java/net/onrc/onos/util/IDBOperation.java

diff --git a/src/main/java/net/onrc/onos/util/IDBOperation.java b/src/main/java/net/onrc/onos/util/IDBOperation.java
index 46245ae..335b08b 100644
--- a/src/main/java/net/onrc/onos/util/IDBOperation.java
+++ b/src/main/java/net/onrc/onos/util/IDBOperation.java
@@ -8,7 +8,7 @@
 import net.onrc.onos.ofcontroller.util.FlowEntryId;
 import net.onrc.onos.ofcontroller.util.FlowId;
 
-public interface IDBOperation {	
+public interface IDBOperation {
 	public ISwitchObject newSwitch(String dpid);
 	public ISwitchObject searchSwitch(String dpid);
 	public ISwitchObject searchActiveSwitch(String dpid);