Merge branch '1.3-rel' (c22b1d43) 87/20187/4
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 26 May 2017 10:34:52 +0000 (12:34 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 26 May 2017 10:34:52 +0000 (12:34 +0200)
commit4ac85a748f50c971393be300ebcae683c36161b3
tree4f08774c9e98b84539ffa001c9371aac403df0b9
parent5fb0d3438b27afb6a1284bba5e4898c2daed6202
parentc22b1d43107c93c0a1fe600386a3e6a8422b083f
Merge branch '1.3-rel' (c22b1d43)

Change-Id: I5307f0ae0ac08a9490ff62f245c1ffd979ae00f7
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
resource/csdk/connectivity/src/ip_adapter/caipserver.c
resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
resource/csdk/connectivity/test/ssladapter_test.cpp
resource/csdk/security/provisioning/src/ocprovisioningmanager.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/stack/src/ocstack.c