Merge branch '1.3-rel' (8414eba9) 73/21473/2
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Mon, 17 Jul 2017 09:57:23 +0000 (11:57 +0200)
committerPhil Coval <philippe.coval@osg.samsung.com>
Mon, 17 Jul 2017 09:59:15 +0000 (09:59 +0000)
Relate-to:
  https://gerrit.iotivity.org/gerrit/21213

Change-Id: I8414eba9d85c04e69533edcfd33ac6b575e96f07
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
1  2 
resource/csdk/security/SConscript
resource/csdk/security/provisioning/sample/sampleserver_justworks.cpp
resource/csdk/security/provisioning/sample/sampleserver_mfg.cpp
resource/csdk/security/provisioning/sample/sampleserver_mvjustworks.cpp
resource/csdk/security/provisioning/sample/sampleserver_preconfpin.cpp
resource/csdk/security/provisioning/sample/sampleserver_randompin.cpp
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/resourcemanager.c

Simple merge