From e9bb60be43af477f17b30ee1f2ba205565b7fa15 Mon Sep 17 00:00:00 2001
From: Ashlee Young <ashlee@onosfw.com>
Date: Mon, 19 Oct 2015 10:14:31 -0700
Subject: Updated onos src tree to commit id
 1e60f97ae50c05b94fcb6a10520738bfb5efdfd1

---
 framework/src/onos/providers/netconf/app/pom.xml                        | 2 +-
 .../org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java | 1 -
 .../provider/of/flow/impl/NewAdaptiveFlowStatsCollector.java            | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'framework/src/onos/providers')

diff --git a/framework/src/onos/providers/netconf/app/pom.xml b/framework/src/onos/providers/netconf/app/pom.xml
index dbd0a520..4a19ae8e 100644
--- a/framework/src/onos/providers/netconf/app/pom.xml
+++ b/framework/src/onos/providers/netconf/app/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>onos-netconf</artifactId>
+    <artifactId>onos-netconf-app</artifactId>
     <packaging>pom</packaging>
 
     <description>NetConf protocol southbound providers</description>
diff --git a/framework/src/onos/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java b/framework/src/onos/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
index 4fa961f8..329df20b 100644
--- a/framework/src/onos/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
+++ b/framework/src/onos/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
@@ -377,7 +377,6 @@ public class OpenFlowDeviceProvider extends AbstractProvider implements DevicePr
         public void receivedRoleReply(Dpid dpid, RoleState requested, RoleState response) {
             MastershipRole request = roleOf(requested);
             MastershipRole reply = roleOf(response);
-
             providerService.receivedRoleReply(deviceId(uri(dpid)), request, reply);
         }
 
diff --git a/framework/src/onos/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/NewAdaptiveFlowStatsCollector.java b/framework/src/onos/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/NewAdaptiveFlowStatsCollector.java
index a81367cd..487cae96 100644
--- a/framework/src/onos/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/NewAdaptiveFlowStatsCollector.java
+++ b/framework/src/onos/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/NewAdaptiveFlowStatsCollector.java
@@ -492,6 +492,7 @@ public class NewAdaptiveFlowStatsCollector {
     /**
      * returns flowMissingXid that indicates the execution of flowMissing process or not(NO_FLOW_MISSING_XID(-1)).
      *
+     * @return xid of missing flow
      */
     public long getFlowMissingXid() {
         return flowMissingXid;
-- 
cgit 1.2.3-korg