Merge branch 'harshanL-merge-master'

This commit is contained in:
Harshan Liyanage 2016-12-08 16:40:32 +05:30
commit e047e0dab8
3447 changed files with 686421 additions and 80683 deletions

View File

@ -17,7 +17,7 @@
~ under the License.
-->
<project name="create-sensors-capps" default="zip" basedir=".">
<project name="create-sensors-capps" default="zip" basedir="">
<property name="project-name" value="${ant.project.name}"/>
<property name="target-dir" value="target/carbonapps"/>

View File

@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>iot-analytics</artifactId>
<version>2.2.8-SNAPSHOT</version>
<version>3.0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Some files were not shown because too many files have changed in this diff Show More