Go to file
Shabirmean 7664f73b4e Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
Conflicts:
	modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/VirtualFireAlarmService.java
	modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/dao/DeviceRecord.java
	modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/dao/TemperatureRecord.java
	modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/dto/TemperatureRecord.java
	modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/util/DataHolder.java
2015-10-23 10:30:36 +05:30
modules Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-10-23 10:30:36 +05:30
.gitignore remove tmp files 2015-08-07 18:57:39 +05:30
LICENSE Initial commit 2015-05-12 11:20:21 +05:30
pom.xml Upgrated to kernel 4.4.2 to comply with latest DAS changes 2015-10-22 07:52:57 +05:30
README.md refactored package and removed unused dependency 2015-08-13 01:50:42 +05:30

product-iot-server