Merge "Upgrade ietf-{inet,yang}-types to 2013-07-15"

diff --cc model/pom.xml
Simple merge

diff --cc model/src/main/yang/neutron-L3.yang
Simple merge

diff --cc neutron-spi/pom.xml
Simple merge

diff --cc parent/pom.xml
Simple merge

diff --cc transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java
index 2f3cd7e77117e200feea444abaf15c64db82410d,421d194306eb7e3ef585363ea22b5d8a19732dfc..f1283f3faa385d401d9006df663332105ea8b255
--- 1/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java
--- 2/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java
@@@ -12,12 -12,12 +12,12 @@@ import java.util.ArrayList
  import java.util.List;
  import org.opendaylight.controller.md.sal.binding.api.DataBroker;
  import org.opendaylight.neutron.spi.INeutronSubnetCRUD;
 +import org.opendaylight.neutron.spi.NeutronRoute;
  import org.opendaylight.neutron.spi.NeutronSubnet;
 -import org.opendaylight.neutron.spi.NeutronSubnet_HostRoute;
  import org.opendaylight.neutron.spi.NeutronSubnetIPAllocationPool;
- import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
- import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefix;
- import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefixBuilder;
+ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix;
+ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefixBuilder;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.Dhcpv6Base;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.Dhcpv6Off;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.Dhcpv6Slaac;