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
..
android_sense	added android sense service and required stream definitions	2015-10-23 07:42:29 +05:30
arduino	added changes to receive customDeviceName from user and register device using this value	2015-10-15 12:21:04 +05:30
digital_display	added changes to receive customDeviceName from user and register device using this value	2015-10-15 12:21:04 +05:30
firealarm	Fix sample deployment issue for samples except virtual fire alarm	2015-10-16 15:40:50 +05:30
lib	Add sample build verification to integration testing	2015-09-01 14:13:38 +05:30
raspberrypi	added changes to receive customDeviceName from user and register device using this value	2015-10-15 12:21:04 +05:30
sensebot	added changes to receive customDeviceName from user and register device using this value	2015-10-15 12:21:04 +05:30
virtual_firealarm	Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server	2015-10-23 10:30:36 +05:30
build.xml	Add sample build verification to integration testing	2015-09-01 14:13:38 +05:30
common.xml	Deploy firealarm-webapp with virtual-firealarm sample	2015-10-22 21:20:17 +05:30
pom.xml	Fix sample deployment issue for samples except virtual fire alarm	2015-10-16 15:40:50 +05:30
sample_pom.xml	added android sense service and required stream definitions	2015-10-23 07:42:29 +05:30