projects / contrib / iotivity.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fee051b) | patch
Merge 13921 and 14039 into master
authorAlex Kelley <alexke@microsoft.com>
Fri, 4 Nov 2016 19:55:33 +0000 (12:55 -0700)
committerRandeep Singh <randeep.s@samsung.com>
Sat, 5 Nov 2016 16:32:30 +0000 (16:32 +0000)
commit163a06004670441ebde778f706c5aa2c0e38fc34
tree53889046e6e3431ad799f4860c3c3f2cc7d0d127tree | snapshot
parentfee051bddff3da05782b63bd364da469869445c7commit | diff
Merge 13921 and 14039 into master

Change-Id: I5b88b2c470614772340bc711e00d1253d647e164
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14051
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
13 files changed:
resource/csdk/SConscript diff | blob | history
resource/csdk/octbstack_product_secured_mot.def [new file with mode: 0644] blob
resource/csdk/security/include/pinoxmcommon.h diff | blob | history
resource/csdk/security/provisioning/include/ocprovisioningmanager.h diff | blob | history
resource/csdk/security/provisioning/include/oxm/oxmpreconfpin.h diff | blob | history
resource/csdk/security/provisioning/sample/provisioningclient.c diff | blob | history
resource/csdk/security/provisioning/sample/subownerclient.c diff | blob | history
resource/csdk/security/provisioning/src/ocprovisioningmanager.c diff | blob | history
resource/csdk/security/provisioning/src/ownershiptransfermanager.c diff | blob | history
resource/csdk/security/provisioning/src/oxmpreconfpin.c diff | blob | history
resource/csdk/security/provisioning/unittest/otmunittest.cpp diff | blob | history
resource/csdk/security/src/credresource.c diff | blob | history
resource/csdk/security/src/oxmpincommon.c diff | blob | history
Domain: SCM / Uncategorized;