Merge branch '1.3-rel' (5a1209c) 79/23479/4
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Sat, 2 Dec 2017 09:02:07 +0000 (10:02 +0100)
committerPhil Coval <philippe.coval@osg.samsung.com>
Mon, 4 Dec 2017 14:27:15 +0000 (14:27 +0000)
commit1a93adc267379391f03974c5c8487b51517dff75
treee9f2dafeb32c53b78d6265105d0cab9c617fe883
parent42a816917f1d6d697149dbd72ee625e2ed084dbd
parent5a1209c2661f525e03e6b7ca6d3b4b1e395ffcab
Merge branch '1.3-rel' (5a1209c)

Relate-to:
        https://gerrit.iotivity.org/gerrit/#/c/23505/

Conflicts:
auto_build.py
build_common/tools/UnpackAll.py
resource/csdk/security/tool/svrdbeditor_src/svrdbeditorcred.c

Change-Id: Id698f81a3ff115d6f31021bbe5fc2c9a325373e8
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
24 files changed:
.gitignore
auto_build.py
java/jni/JniCaInterface.c
java/jni/JniOcSecureResource.cpp
resource/csdk/resource-directory/samples/rd_publishingClient.cpp
resource/csdk/resource-directory/src/internal/rd_database.c
resource/csdk/resource-directory/src/rd_client.c
resource/csdk/resource-directory/src/rd_server.c
resource/csdk/resource-directory/unittests/rddatabase.cpp
resource/csdk/resource-directory/unittests/rdtests.cpp
resource/csdk/security/include/experimental/doxmresource.h
resource/csdk/security/provisioning/src/ownershiptransfermanager.c
resource/csdk/security/src/aclresource.c
resource/csdk/security/src/credresource.c
resource/csdk/security/src/deviceonboardingstate.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/pstatresource.c
resource/csdk/security/src/srmutility.c
resource/csdk/security/tool/svrdbeditor_src/svrdbeditorcred.c
resource/csdk/security/tool/svrdbeditor_src/svrdbeditordoxm.c
resource/csdk/stack/src/ocstack.c
resource/csdk/stack/src/oicresourcedirectory.c
service/easy-setup/enrollee/src/easysetup.c
service/easy-setup/enrollee/src/resourcehandler.c