review.tizen.org Git - platform/upstream/iotivity.git/commit

projects / platform / upstream / iotivity.git / commit

author	George Nash <george.nash@intel.com>
	Fri, 11 Nov 2016 18:23:17 +0000 (10:23 -0800)
committer	George Nash <george.nash@intel.com>
	Fri, 11 Nov 2016 18:53:05 +0000 (10:53 -0800)
commit	0cea71f91bc1c6d26bb705f3abace2c002321d56
tree	810eeac06826f881bcf18349945992def88c96c1	tree \| snapshot
parent	5f7578bc8a1fbdabd20af011c6f664e74d83eab5	commit \| diff
parent	464121d7fd19b34afa6afc06a26333823ff722a1	commit \| diff

[IOT-1089] Merge remote-tracking branch 'origin/master' into generic-java

Change-Id: I6627b56dbe51592159eefebde3f63480eb61f8ee
Signed-off-by: George Nash <george.nash@intel.com>

28 files changed:

build_common/SConscript	diff1 \|	diff2 \|	blob \| history
build_common/external_libs.scons	diff1 \|	diff2 \|	blob \| history
java/common/src/main/java/org/iotivity/base/OcResourceResponse.java	diff1 \|	diff2 \|	blob \| history
java/examples-android/fridgegroupserver/src/main/java/org/iotivity/base/examples/DoorResource.java	diff1 \|	diff2 \|	blob \| history
java/examples-android/fridgegroupserver/src/main/java/org/iotivity/base/examples/LightResource.java	diff1 \|	diff2 \|	blob \| history
java/examples-android/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/DeviceResource.java	diff1 \|	diff2 \|	blob \| history
java/examples-android/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/DoorResource.java	diff1 \|	diff2 \|	blob \| history
java/examples-android/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/LightResource.java	diff1 \|	diff2 \|	blob \| history
java/examples-android/presenceclient/src/main/java/org/iotivity/base/examples/PresenceClient.java	diff1 \|	diff2 \|	blob \| history
java/examples-android/presenceserver/src/main/java/org/iotivity/base/examples/PresenceServer.java	diff1 \|	diff2 \|	blob \| history
java/examples-android/simplebase/src/main/java/org/iotivity/base/examples/CloudFragment.java	diff1 \|	diff2 \|	blob \| history
java/examples-android/simplebase/src/main/res/layout/fragment_cloud.xml	diff1 \|	diff2 \|	blob \| history
java/examples-android/simplebase/src/main/res/layout/input.xml	diff1 \|	diff2 \|	blob \| history
java/examples-android/simpleserver/src/main/java/org/iotivity/base/examples/Light.java	diff1 \|	diff2 \|	blob \| history
java/examples-java/fridgegroupserver/src/main/java/org/iotivity/base/examples/DoorResource.java	diff1 \|	\|	blob \| history
java/examples-java/fridgegroupserver/src/main/java/org/iotivity/base/examples/LightResource.java	diff1 \|	\|	blob \| history
java/examples-java/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/DeviceResource.java	diff1 \|	\|	blob \| history
java/examples-java/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/DoorResource.java	diff1 \|	\|	blob \| history
java/examples-java/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/LightResource.java	diff1 \|	\|	blob \| history
java/examples-java/simpleserver/src/main/java/org/iotivity/base/examples/Light.java	diff1 \|	\|	blob \| history
java/iotivity-android/build.gradle	diff1 \|	diff2 \|	blob \| history
java/iotivity-android/src/androidTest/java/org/iotivity/base/SmokeTest.java	diff1 \|	diff2 \|	blob \| history
java/jni/JniOcResourceResponse.cpp	diff1 \|	diff2 \|	blob \| history
java/jni/JniOcResourceResponse.h	diff1 \|	diff2 \|	blob \| history
java/jni/JniOnPublishResourceListener.cpp	diff1 \|	diff2 \|	blob \| history
resource/docs/javadocGen.sh	diff1 \|	diff2 \|	blob \| history
service/easy-setup/mediator/richsdk/SConscript	diff1 \|	diff2 \|	blob \| history
service/notification/cpp-wrapper/provider/SConscript	diff1 \|	diff2 \|	blob \| history

Domain: Network & Connectivity / IoT Connectivity;

RSS Atom

build_common/SConscript	diff1 \|	diff2 \|	blob \| history
build_common/external_libs.scons	diff1 \|	diff2 \|	blob \| history
java/common/src/main/java/org/iotivity/base/OcResourceResponse.java	diff1 \|	diff2 \|	blob \| history
java/examples-android/fridgegroupserver/src/main/java/org/iotivity/base/examples/DoorResource.java	diff1 \|	diff2 \|	blob \| history
java/examples-android/fridgegroupserver/src/main/java/org/iotivity/base/examples/LightResource.java	diff1 \|	diff2 \|	blob \| history
java/examples-android/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/DeviceResource.java	diff1 \|	diff2 \|	blob \| history
java/examples-android/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/DoorResource.java	diff1 \|	diff2 \|	blob \| history
java/examples-android/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/LightResource.java	diff1 \|	diff2 \|	blob \| history
java/examples-android/presenceclient/src/main/java/org/iotivity/base/examples/PresenceClient.java	diff1 \|	diff2 \|	blob \| history
java/examples-android/presenceserver/src/main/java/org/iotivity/base/examples/PresenceServer.java	diff1 \|	diff2 \|	blob \| history
java/examples-android/simplebase/src/main/java/org/iotivity/base/examples/CloudFragment.java	diff1 \|	diff2 \|	blob \| history
java/examples-android/simplebase/src/main/res/layout/fragment_cloud.xml	diff1 \|	diff2 \|	blob \| history
java/examples-android/simplebase/src/main/res/layout/input.xml	diff1 \|	diff2 \|	blob \| history
java/examples-android/simpleserver/src/main/java/org/iotivity/base/examples/Light.java	diff1 \|	diff2 \|	blob \| history
java/examples-java/fridgegroupserver/src/main/java/org/iotivity/base/examples/DoorResource.java	diff1 \|	\|	blob \| history
java/examples-java/fridgegroupserver/src/main/java/org/iotivity/base/examples/LightResource.java	diff1 \|	\|	blob \| history
java/examples-java/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/DeviceResource.java	diff1 \|	\|	blob \| history
java/examples-java/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/DoorResource.java	diff1 \|	\|	blob \| history
java/examples-java/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/LightResource.java	diff1 \|	\|	blob \| history
java/examples-java/simpleserver/src/main/java/org/iotivity/base/examples/Light.java	diff1 \|	\|	blob \| history
java/iotivity-android/build.gradle	diff1 \|	diff2 \|	blob \| history
java/iotivity-android/src/androidTest/java/org/iotivity/base/SmokeTest.java	diff1 \|	diff2 \|	blob \| history
java/jni/JniOcResourceResponse.cpp	diff1 \|	diff2 \|	blob \| history
java/jni/JniOcResourceResponse.h	diff1 \|	diff2 \|	blob \| history
java/jni/JniOnPublishResourceListener.cpp	diff1 \|	diff2 \|	blob \| history
resource/docs/javadocGen.sh	diff1 \|	diff2 \|	blob \| history
service/easy-setup/mediator/richsdk/SConscript	diff1 \|	diff2 \|	blob \| history
service/notification/cpp-wrapper/provider/SConscript	diff1 \|	diff2 \|	blob \| history