Merge branch '1.3-rel' (28c09f73) 29/21729/1
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Wed, 2 Aug 2017 12:01:48 +0000 (14:01 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Wed, 2 Aug 2017 12:01:50 +0000 (14:01 +0200)
Relate-to:
https://gerrit.iotivity.org/gerrit/21549
https://gerrit.iotivity.org/gerrit/21373
https://gerrit.iotivity.org/gerrit/21573
https://gerrit.iotivity.org/gerrit/21591
https://gerrit.iotivity.org/gerrit/21595

Change-Id: I28c09f7365cfae2d9d6b2a4d41c6f2da9614fd5b
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
13 files changed:
1  2 
resource/c_common/SConscript
resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
resource/csdk/security/SConscript
resource/csdk/security/provisioning/sample/autoprovisioningclient.c
resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
resource/csdk/security/provisioning/src/ownershiptransfermanager.c
resource/csdk/security/provisioning/unittest/otmunittest.cpp
resource/csdk/security/src/credresource.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/resourcemanager.c
resource/csdk/stack/include/ocpayload.h
service/easy-setup/enrollee/src/resourcehandler.c
tools/tizen/iotivity.spec

Simple merge
Simple merge
Simple merge