Merge "Update the dependency version in alto-parent"
authorY. Richard Yang <yry@cs.yale.edu>
Fri, 11 Sep 2015 00:34:58 +0000 (00:34 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 11 Sep 2015 00:34:58 +0000 (00:34 +0000)
1  2 
alto-manager/pom.xml
features/src/main/resources/features.xml
pom.xml

Simple merge
diff --cc pom.xml
index 9f46be64ebc91f5a0db4fd6c7b4f5c8dbe4f9cfe,4bdea6ffa68c4d3827764ad941085c02cc0b34fa..08d834c58ba2dfa3b3060136ee76ddf0c88b7635
+++ b/pom.xml
@@@ -42,9 -35,8 +42,9 @@@
  
    <properties>
      <odl.version>1.6.0-SNAPSHOT</odl.version>
-     <karaf.shell.version>2.2.11</karaf.shell.version>
+     <karaf.shell.version>${karaf.version}</karaf.shell.version>
  
 +
      <!-- required by alto command line -->
      <httpclient.version>4.4.1</httpclient.version>