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
..
distribution	added android sense service and required stream definitions	2015-10-23 07:42:29 +05:30
feature/org.wso2.carbon.device.mgt.iot.util.feature	added das features	2015-09-13 19:30:52 +05:30
integration	Add sample build verification to integration testing	2015-09-01 14:13:38 +05:30
p2-profile-gen	DAS update	2015-10-16 16:58:39 +05:30
samples	Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server	2015-10-23 10:30:36 +05:30