| commit | 7bdf4d4daaf7910f8b58a7aa8dc399727f5d8475 | [log] [tgz] |
|---|---|---|
| author | sunish vk <sunish.vk@cognizant.com> | Fri Jun 24 12:29:43 2016 +0530 |
| committer | sunish vk <sunish.vk@cognizant.com> | Fri Jun 24 14:28:17 2016 +0530 |
| tree | f8cf79ab4cddad39135bef9dd72345d5eeb44879 | |
| parent | 465a9b8ec238f5de291ae87c247978bc6682c56c [diff] [blame] |
ISIS protocol manual merge from 1.6 due to cherry pick merge conflict Change-Id: I6c3abf6a83ddaeba76293dc7864fcec88e9b4e7e
diff --git a/protocols/isis/api/src/main/java/org/onosproject/isis/controller/IsisInterface.java b/protocols/isis/api/src/main/java/org/onosproject/isis/controller/IsisInterface.java index 3f775cc..d80c208 100644 --- a/protocols/isis/api/src/main/java/org/onosproject/isis/controller/IsisInterface.java +++ b/protocols/isis/api/src/main/java/org/onosproject/isis/controller/IsisInterface.java
@@ -318,4 +318,4 @@ * Removes all the neighbors. */ void removeNeighbors(); -} +} \ No newline at end of file