Merge branch '1.3-rel' (acdf0b6) 53/23853/1
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Tue, 2 Jan 2018 09:32:37 +0000 (10:32 +0100)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Tue, 2 Jan 2018 09:32:50 +0000 (10:32 +0100)
Relate-to:
https://gerrit.iotivity.org/gerrit/#/c/23485/

Change-Id: Iacdf0b66d970a07b93bdcab0c793ab4117076da6
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
1  2 
auto_build.py
java/jni/JniOcProvisioning.cpp
resource/csdk/security/provisioning/sample/sampleserver_randompin.cpp
resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/tool/json2cbor.c
resource/provisioning/examples/cloudAuth.cpp
resource/provisioning/examples/cloudWrapper.cpp
resource/provisioning/examples/provisioningclient.cpp
resource/provisioning/src/OCProvisioningManager.cpp

diff --cc auto_build.py
Simple merge
Simple merge