commit | 6384a6d6dee3c6381ef5f7aa48ddadd79fc79bdb | [log] [tgz] |
---|---|---|
author | tom <tom@onlab.us> | Mon Sep 29 13:47:19 2014 -0700 |
committer | tom <tom@onlab.us> | Mon Sep 29 13:47:19 2014 -0700 |
tree | e6a6a19b6649d95838e23a989f0c7a1203936700 | |
parent | 7309483930b7bc1055c7256e3bc5c6b452a0b47e [diff] | |
parent | 7aef393450b5bf473b07689905dca4376f4b8025 [diff] |
Merge remote-tracking branch 'origin/master'
diff --git a/core/api/src/main/java/org/onlab/onos/net/proxyarp/package-info.java b/core/api/src/main/java/org/onlab/onos/net/proxyarp/package-info.java index 4917c6e..30d44e7 100644 --- a/core/api/src/main/java/org/onlab/onos/net/proxyarp/package-info.java +++ b/core/api/src/main/java/org/onlab/onos/net/proxyarp/package-info.java
@@ -1,4 +1,4 @@ /** * Base abstractions related to the proxy arp service. */ -package org.onlab.onos.net.proxyarp; \ No newline at end of file +package org.onlab.onos.net.proxyarp;
diff --git a/core/net/src/main/java/org/onlab/onos/proxyarp/impl/package-info.java b/core/net/src/main/java/org/onlab/onos/proxyarp/impl/package-info.java index a9ad72a..7a5dc6e8 100644 --- a/core/net/src/main/java/org/onlab/onos/proxyarp/impl/package-info.java +++ b/core/net/src/main/java/org/onlab/onos/proxyarp/impl/package-info.java
@@ -1,4 +1,4 @@ /** * Core subsystem for responding to arp requests. */ -package org.onlab.onos.proxyarp.impl; \ No newline at end of file +package org.onlab.onos.proxyarp.impl;