From: Robert Varga <rovarga@cisco.com>
Date: Thu, 17 Oct 2013 08:43:27 +0000 (+0000)
Subject: Merge "Additional imports fix."
X-Git-Tag: jenkins-bgpcep-bulk-release-prepare-only-1~237^2~150
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=ffc01f4d4377fbc46ff65306e33ac30c8b82f2f1;p=bgpcep.git

Merge "Additional imports fix."
---

ffc01f4d4377fbc46ff65306e33ac30c8b82f2f1
diff --cc pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNoPathObjectParser.java
index 66102e1ef9,4df08ec18a..19355b75e5
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNoPathObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPNoPathObjectParser.java
@@@ -12,11 -12,11 +12,11 @@@ import java.util.BitSet
  import org.opendaylight.protocol.pcep.PCEPDeserializerException;
  import org.opendaylight.protocol.pcep.PCEPDocumentedException;
  import org.opendaylight.protocol.pcep.impl.Util;
 -import org.opendaylight.protocol.pcep.spi.AbstractObjectWithTlvsParser;
 +import org.opendaylight.protocol.pcep.impl.message.AbstractObjectWithTlvsParser;
  import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
  import org.opendaylight.protocol.util.ByteArray;
- import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.pcrep.pcrep.message.replies.result.failure.NoPath;
- import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.pcrep.pcrep.message.replies.result.failure.no.path.Tlvs;
+ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcrep.message.pcrep.message.replies.result.failure.NoPath;
+ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcrep.message.pcrep.message.replies.result.failure.no.path.Tlvs;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.NoPathObject;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Object;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.ObjectHeader;