| commit | ebdd4850e5fb8da5c7777809e13f2f194b611309 | [log] [tgz] |
|---|---|---|
| author | Ray Milkey <ray@opennetworking.org> | Wed Oct 18 16:19:28 2017 -0700 |
| committer | Ray Milkey <ray@opennetworking.org> | Mon Oct 23 22:05:06 2017 +0000 |
| tree | da827ef1f6f15b1ccd2fdcb9a17273b9e9d21485 | |
| parent | 0a44fde0fc825d440213959d801b5982beecb607 [diff] |
Move meter manager implementation out of incubator Change-Id: Ide0905c55e0584361fe37c3c5e16c697533eb9f9
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java b/core/net/src/main/java/org/onosproject/net/meter/impl/MeterManager.java similarity index 99% rename from incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java rename to core/net/src/main/java/org/onosproject/net/meter/impl/MeterManager.java index f7418ab..1173f1d 100644 --- a/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java +++ b/core/net/src/main/java/org/onosproject/net/meter/impl/MeterManager.java
@@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.incubator.net.meter.impl; +package org.onosproject.net.meter.impl; import com.google.common.collect.Maps; import org.apache.felix.scr.annotations.Activate;
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/meter/impl/package-info.java similarity index 92% rename from incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/package-info.java rename to core/net/src/main/java/org/onosproject/net/meter/impl/package-info.java index 4f2b7dc..cd2eb11 100644 --- a/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/package-info.java +++ b/core/net/src/main/java/org/onosproject/net/meter/impl/package-info.java
@@ -17,4 +17,4 @@ /** * Provides implementation of the meter service APIs. */ -package org.onosproject.incubator.net.meter.impl; +package org.onosproject.net.meter.impl;
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/meter/impl/MeterManagerTest.java b/core/net/src/test/java/org/onosproject/net/meter/impl/MeterManagerTest.java similarity index 99% rename from incubator/net/src/test/java/org/onosproject/incubator/net/meter/impl/MeterManagerTest.java rename to core/net/src/test/java/org/onosproject/net/meter/impl/MeterManagerTest.java index 89a9350..cc19cd0 100644 --- a/incubator/net/src/test/java/org/onosproject/incubator/net/meter/impl/MeterManagerTest.java +++ b/core/net/src/test/java/org/onosproject/net/meter/impl/MeterManagerTest.java
@@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.incubator.net.meter.impl; +package org.onosproject.net.meter.impl; import com.google.common.collect.Maps; import com.google.common.collect.Sets;