commit | f7c5655c12dd3d03507f31d6245d38c64a83e5ea | [log] [tgz] |
---|---|---|
author | sunishvk <sunish.vk@cognizant.com> | Mon Jul 18 16:02:39 2016 +0530 |
committer | Gerrit Code Review <gerrit@onlab.us> | Tue Jul 26 17:26:10 2016 +0000 |
tree | b65296f34fa7b41ef8c1f7781a113241901d9fb5 | |
parent | b977f56ac25576cbe58f0ed812234134659695b2 [diff] [blame] |
OSPF protocol manual merge from 1.6, due to cherry pick merge conflict Change-Id: I93653e745468722ce95533537a79e897b4292f5d
diff --git a/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/ospfpacket/types/DdPacket.java b/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/ospfpacket/types/DdPacket.java index dbadad7..2a78df7 100644 --- a/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/ospfpacket/types/DdPacket.java +++ b/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/ospfpacket/types/DdPacket.java
@@ -23,7 +23,7 @@ import org.onosproject.ospf.protocol.lsa.LsaHeader; import org.onosproject.ospf.protocol.lsa.OpaqueLsaHeader; import org.onosproject.ospf.protocol.ospfpacket.OspfPacketHeader; -import org.onosproject.ospf.protocol.util.OspfPacketType; +import org.onosproject.ospf.controller.OspfPacketType; import org.onosproject.ospf.protocol.util.OspfParameters; import org.onosproject.ospf.protocol.util.OspfUtil; import org.slf4j.Logger;