Merge "1.add a flag that allow igmp join/leave with out ssm translate; 2.catch the exception while configured an invalid igmp global connect point"
diff --git a/app.xml b/app.xml
index 7da9bee..3d0d138 100644
--- a/app.xml
+++ b/app.xml
@@ -14,9 +14,9 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<app name="org.opencord.igmpproxy" origin="Nokia" version="1.1.0-SNAPSHOT"
- featuresRepo="mvn:org.opencord/onos-app-igmpproxy/1.1.0-SNAPSHOT/xml/features"
+<app name="org.opencord.igmpproxy" origin="Nokia" version="1.2.0-SNAPSHOT"
+ featuresRepo="mvn:org.opencord/onos-app-igmpproxy/1.2.0-SNAPSHOT/xml/features"
features="onos-app-igmpproxy" apps="org.opencord.mcast">
<description>IGMP PROXY APP</description>
- <artifact>mvn:org.opencord/onos-app-igmpproxy/1.1.0-SNAPSHOT</artifact>
+ <artifact>mvn:org.opencord/onos-app-igmpproxy/1.2.0-SNAPSHOT</artifact>
</app>
diff --git a/pom.xml b/pom.xml
index 1718f7c..f98cc7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.opencord</groupId>
<artifactId>onos-app-igmpproxy</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>IGMP PROXY APP</description>
@@ -42,7 +42,7 @@
<onos.app.readme>IGMP implementation.</onos.app.readme>
<onos.app.requires>org.opencord.config</onos.app.requires>
<onos.app.requires>org.opencord.mcast</onos.app.requires>
- <cord.config.version>1.3.0-SNAPSHOT</cord.config.version>
+ <cord.config.version>1.4.0-SNAPSHOT</cord.config.version>
<!-- TODO onos-build-conf.version can be dropped when onos.version > 1.10.3 -->
<onos-build-conf.version>1.10.3-onf</onos-build-conf.version>
</properties>