projects / contrib / iotivity.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 500cb83 9b06239)
Merge branch 'master' into iot-1785
authorKevin Kane <kkane@microsoft.com>
Fri, 10 Mar 2017 18:36:02 +0000 (10:36 -0800)
committerKevin Kane <kkane@microsoft.com>
Fri, 10 Mar 2017 18:42:42 +0000 (10:42 -0800)
commit2f70e0dd6c6f7f8b7ef9aaf855ad437e2ce7d26d
treeeb26273492874f4cbe96b51fa95bfef33ad0fa20tree | snapshot
parent500cb83d9c1e5f87b41a12bbf4d2e8e8ce8af808commit | diff
parent9b06239a01fa7cb3fcb487c613efaac3d32e3dd1commit | diff
Merge branch 'master' into iot-1785

Conflicts:
  Restore OIC_JSON_SUBJECT_NAME definition in srmresourcestrings.{c,h}
  Warning settings in resource/csdk/security/SConscript

Change-Id: Iabb48389b8aaa1ffa480287979df264e30bfac89
Signed-off-by: Kevin Kane <kkane@microsoft.com>
20 files changed:
resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c diff1 | diff2 | blob | history
resource/csdk/connectivity/src/caconnectivitymanager.c diff1 | diff2 | blob | history
resource/csdk/connectivity/test/ssladapter_test.cpp diff1 | diff2 | blob | history
resource/csdk/security/SConscript diff1 | diff2 | blob | history
resource/csdk/security/include/internal/srmresourcestrings.h diff1 | diff2 | blob | history
resource/csdk/security/include/securevirtualresourcetypes.h diff1 | diff2 | blob | history
resource/csdk/security/provisioning/include/ocprovisioningmanager.h diff1 | diff2 | blob | history
resource/csdk/security/provisioning/sample/provisioningclient.c diff1 | diff2 | blob | history
resource/csdk/security/provisioning/sample/subownerclient.c diff1 | diff2 | blob | history
resource/csdk/security/provisioning/src/ocprovisioningmanager.c diff1 | diff2 | blob | history
resource/csdk/security/provisioning/src/ownershiptransfermanager.c diff1 | diff2 | blob | history
resource/csdk/security/provisioning/src/secureresourceprovider.c diff1 | diff2 | blob | history
resource/csdk/security/src/credresource.c diff1 | diff2 | blob | history
resource/csdk/security/src/doxmresource.c diff1 | diff2 | blob | history
resource/csdk/security/src/dpairingresource.c diff1 | diff2 | blob | history
resource/csdk/security/src/policyengine.c diff1 | diff2 | blob | history
resource/csdk/security/src/resourcemanager.c diff1 | diff2 | blob | history
resource/csdk/security/src/srmresourcestrings.c diff1 | diff2 | blob | history
resource/csdk/security/tool/json2cbor.c diff1 | diff2 | blob | history
resource/csdk/stack/octbstack_product_secured.def diff1 | diff2 | blob | history
Domain: SCM / Uncategorized;