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

projects / platform / upstream / iotivity.git / commit

author	hyuna0213.jo <hyuna0213.jo@samsung.com>
	Wed, 19 Aug 2015 03:53:37 +0000 (12:53 +0900)
committer	Jon A. Cruz <jonc@osg.samsung.com>
	Thu, 20 Aug 2015 03:27:23 +0000 (03:27 +0000)
commit	b2e13cb430aeee5eca38253a454a0665eb6a68b6
tree	327d6e5c196af3afcc2eebd1ef7464c62659aa78	tree \| snapshot
parent	0a4a78aabb97393927aea3facb0cd6cf724df790	commit \| diff

Merge master to cloud-interface branch

merge master branch to use latest master code.

Change-Id: I57a2415e334c99755df87da5f97f28deb3ce5d76
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2238
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tested-by: Jon A. Cruz <jonc@osg.samsung.com>

87 files changed:

android/BuildInstructionsForAndroidAPI.txt		diff \| blob \| history
android/android_api/SConscript		diff \| blob \| history
android/android_api/base/src/main/java/org/iotivity/base/OcPlatform.java		diff \| blob \| history
android/android_api/base/src/main/java/org/iotivity/ca/CaLeClientInterface.java		diff \| blob \| history
android/android_api/base/src/main/java/org/iotivity/ca/CaLeServerInterface.java		diff \| blob \| history
auto_build.sh		diff \| blob \| history
build_common/android/compatibility/c_compat.c		diff \| blob \| history
resource/c_common/platform_features.h		diff \| blob \| history
resource/csdk/connectivity/api/cacommon.h		diff \| blob \| history
resource/csdk/connectivity/api/cainterface.h		diff \| blob \| history
resource/csdk/connectivity/common/inc/uarraylist.h		diff \| blob \| history
resource/csdk/connectivity/common/src/caremotehandler.c		diff \| blob \| history
resource/csdk/connectivity/common/src/cathreadpool_pthreads.c		diff \| blob \| history
resource/csdk/connectivity/common/src/uarraylist.c		diff \| blob \| history
resource/csdk/connectivity/inc/caadapterinterface.h		diff \| blob \| history
resource/csdk/connectivity/inc/caadapternetdtls.h		diff \| blob \| history
resource/csdk/connectivity/inc/caipinterface.h		diff \| blob \| history
resource/csdk/connectivity/inc/camessagehandler.h		diff \| blob \| history
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/jni/ResourceModel.c		diff \| blob \| history
resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c		diff \| blob \| history
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.c		diff \| blob \| history
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.h		diff \| blob \| history
resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrendpoint.c		diff \| blob \| history
resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrnwmonitor.c		diff \| blob \| history
resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c		diff \| blob \| history
resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.h		diff \| blob \| history
resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c		diff \| blob \| history
resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.h		diff \| blob \| history
resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c		diff \| blob \| history
resource/csdk/connectivity/src/bt_le_adapter/tizen/cableserver.c		diff \| blob \| history
resource/csdk/connectivity/src/cablockwisetransfer.c		diff \| blob \| history
resource/csdk/connectivity/src/cainterfacecontroller.c		diff \| blob \| history
resource/csdk/connectivity/src/camessagehandler.c		diff \| blob \| history
resource/csdk/connectivity/src/canetworkconfigurator.c		diff \| blob \| history
resource/csdk/connectivity/src/caprotocolmessage.c		diff \| blob \| history
resource/csdk/connectivity/src/ip_adapter/android/caipnwmonitor.c	[changed mode: 0644->0755]	diff \| blob \| history
resource/csdk/connectivity/src/ip_adapter/arduino/caipnwmonitor_eth.cpp		diff \| blob \| history
resource/csdk/connectivity/src/ip_adapter/arduino/caipnwmonitor_wifi.cpp		diff \| blob \| history
resource/csdk/connectivity/src/ip_adapter/arduino/caipserver_eth.cpp		diff \| blob \| history
resource/csdk/connectivity/src/ip_adapter/arduino/caipserver_wifi.cpp		diff \| blob \| history
resource/csdk/connectivity/src/ip_adapter/caipadapter.c		diff \| blob \| history
resource/csdk/connectivity/src/ip_adapter/caipserver.c		diff \| blob \| history
resource/csdk/connectivity/src/ip_adapter/linux/caipnwmonitor.c		diff \| blob \| history
resource/csdk/connectivity/src/ip_adapter/tizen/caipnwmonitor.c		diff \| blob \| history
resource/csdk/doc/CCF Lite GIT Repo Layout.docx	[deleted file]	blob \| history
resource/csdk/security/src/secureresourcemanager.c		diff \| blob \| history
resource/csdk/stack/include/octypes.h		diff \| blob \| history
resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript		diff \| blob \| history
resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp		diff \| blob \| history
resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp		diff \| blob \| history
resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.h		diff \| blob \| history
resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp		diff \| blob \| history
resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.cpp		diff \| blob \| history
resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp		diff \| blob \| history
resource/csdk/stack/src/ocpayloadconvert.c		diff \| blob \| history
resource/csdk/stack/src/ocpayloadparse.c		diff \| blob \| history
resource/csdk/stack/src/ocstack.c		diff \| blob \| history
resource/examples/simpleclient.cpp		diff \| blob \| history
resource/examples/simpleclientHQ.cpp		diff \| blob \| history
resource/src/OCRepresentation.cpp		diff \| blob \| history
resource/third_party_libs.scons		diff \| blob \| history
service/SConscript		diff \| blob \| history
service/notification-manager/NotificationManager/src/ResourceHosting.cpp		diff \| blob \| history
service/protocol-plugin/plugins/mqtt-light/lib/cpp/test.txt	[deleted file]	blob \| history
service/resource-encapsulation/SConscript		diff \| blob \| history
service/resource-encapsulation/examples/linux/SampleResourceClient.cpp		diff \| blob \| history
service/resource-encapsulation/include/RCSDiscoveryManager.h		diff \| blob \| history
service/resource-encapsulation/include/RCSResourceAttributes.h		diff \| blob \| history
service/resource-encapsulation/include/RCSResourceObject.h		diff \| blob \| history
service/resource-encapsulation/src/common/SConscript		diff \| blob \| history
service/resource-encapsulation/src/common/primitiveResource/src/RCSResourceAttributes.cpp		diff \| blob \| history
service/resource-encapsulation/src/common/utils/include/AtomicHelper.h	[new file with mode: 0644]	blob
service/resource-encapsulation/src/resourceBroker/include/ResourcePresence.h		diff \| blob \| history
service/resource-encapsulation/src/resourceBroker/src/ResourcePresence.cpp		diff \| blob \| history
service/resource-encapsulation/src/resourceClient/RCSDiscoveryManager.cpp		diff \| blob \| history
service/resource-encapsulation/src/resourceContainer/SConscript		diff \| blob \| history
service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp		diff \| blob \| history
service/resource-encapsulation/src/serverBuilder/SConscript		diff \| blob \| history
service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp		diff \| blob \| history
service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp		diff \| blob \| history
service/resource-encapsulation/unittests/ResourceClientTest.cpp		diff \| blob \| history
service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/DataReader.java		diff \| blob \| history
service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/ModelData.java		diff \| blob \| history
service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/QueryEngine.java		diff \| blob \| history
service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore_JNI.cpp		diff \| blob \| history
service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore_JNI.h		diff \| blob \| history
service/third_party_libs.scons		diff \| blob \| history

Domain: Network & Connectivity / IoT Connectivity;

RSS Atom