commit c69c66ae54b2e280591c989349a8221101c4ebc6
author Kavitha Alagesan <kalagesa@partner.ciena.com> Wed Jun 15 14:26:04 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Mon Aug 08 17:56:09 2016 +0000
tree 87f4f63a495da0afe04428c256e690591dff4c9c
parent 63eeac3ea8bacb800f888b68b01f21e0f771652c

Merged master fixed conflict.

Change-Id: I1260048f4cc90c422ce6033d506c25ec38d6cc3a

core/api/src/test/java/org/onosproject/net/flow/FlowRuleServiceAdapter.java

diff --git a/core/api/src/test/java/org/onosproject/net/flow/FlowRuleServiceAdapter.java b/core/api/src/test/java/org/onosproject/net/flow/FlowRuleServiceAdapter.java
index a12308d..4335983 100644
--- a/core/api/src/test/java/org/onosproject/net/flow/FlowRuleServiceAdapter.java
+++ b/core/api/src/test/java/org/onosproject/net/flow/FlowRuleServiceAdapter.java
@@ -38,6 +38,10 @@
     }
 
     @Override
+    public void purgeFlowRules(DeviceId deviceId){
+    }
+
+    @Override
     public void removeFlowRules(FlowRule... flowRules) {
     }