Merge branch 'master' into iot-1785
authorKevin Kane <kkane@microsoft.com>
Mon, 27 Mar 2017 15:32:09 +0000 (08:32 -0700)
committerKevin Kane <kkane@microsoft.com>
Mon, 27 Mar 2017 15:32:09 +0000 (08:32 -0700)
commite5cfc014a23d5188f3e35901aeba106ebf33bbc3
tree64b982a82e75df1817c9fa3abb5d632136549157
parent24b335908e3d70945d34222058dab0e9b80f1127
parente41b6e2c4719782d54b042198f2e95478dff9613
Merge branch 'master' into iot-1785

Change-Id: I7adad0e43bced555c87a3b3d7f220f2fff79a13a
Signed-off-by: Kevin Kane <kkane@microsoft.com>
15 files changed:
extlibs/mbedtls/config-iotivity.h
resource/csdk/connectivity/api/cacommon.h
resource/csdk/connectivity/test/ca_api_unittest.cpp
resource/csdk/connectivity/test/ssladapter_test.cpp
resource/csdk/security/include/internal/srmresourcestrings.h
resource/csdk/security/include/securevirtualresourcetypes.h
resource/csdk/security/provisioning/sample/provisioningclient.c
resource/csdk/security/provisioning/sample/subownerclient.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/provisioning/unittest/secureresourceprovider.cpp
resource/csdk/security/src/credresource.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/srmresourcestrings.c
resource/csdk/security/tool/json2cbor.c
resource/csdk/stack/octbstack_product_secured.def