Merge tag '1.3.0-RC3' into master 11/20311/2
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Tue, 23 May 2017 08:42:17 +0000 (10:42 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Tue, 23 May 2017 16:47:12 +0000 (18:47 +0200)
commit2026f9e3362091a5c62904e56981d023ec39b39a
tree9a75ca19ded9ff1cf097756c500ef1f1706a609a
parent7f8b011c753995de77120ece325ca3728cae120f
parente967aab904707d882257dd0674cb5232dec44cdc
Merge tag '1.3.0-RC3' into master

1.3.0 release candidate RC3

Conflicts:
resource/c_common/octhread/src/posix/octhread.c
resource/c_common/octhread/src/windows/octhread.c
resource/csdk/security/src/credresource.c
run.bat

Change-Id: I56923e53e9b81da45b9ff9e50e7df9cdde233c25
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
26 files changed:
build_common/SConscript
resource/IPCA/unittests/SConscript
resource/c_common/octhread/src/posix/octhread.c
resource/c_common/octhread/src/windows/octhread.c
resource/c_common/platform_features.h
resource/csdk/connectivity/api/cacommon.h
resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
resource/csdk/connectivity/src/cainterfacecontroller.c
resource/csdk/connectivity/src/camessagehandler.c
resource/csdk/connectivity/src/ip_adapter/caipserver.c
resource/csdk/connectivity/src/ip_adapter/linux/caipnwmonitor.c
resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
resource/csdk/include/octypes.h
resource/csdk/security/provisioning/src/ocprovisioningmanager.c
resource/csdk/security/provisioning/src/ownershiptransfermanager.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/src/credresource.c
resource/csdk/security/src/crlresource.c
resource/csdk/security/src/doxmresource.c
resource/csdk/stack/src/ocresource.c
resource/csdk/stack/src/ocstack.c
resource/unittests/OCRepresentationTest.cpp
run.bat
service/notification/src/provider/NSProviderNotification.c
service/resource-encapsulation/src/common/SConscript
service/resource-encapsulation/src/serverBuilder/SConscript