Merge branch 'master' into iot-1785 09/17709/3
authorKevin Kane <kkane@microsoft.com>
Mon, 6 Mar 2017 23:06:02 +0000 (15:06 -0800)
committerKevin Kane <kkane@microsoft.com>
Mon, 6 Mar 2017 23:06:02 +0000 (15:06 -0800)
commit4de03691d17aa15429648ee4043fac482d597ca2
tree38f26e0826dad02960616455110c0e4b8ad44ec4
parent9215fe671a4147b71ac353e2724fd1fb45c419f6
parent5d0e3489aeba0849defa310bb48818944b60d62d
Merge branch 'master' into iot-1785

Change-Id: I387fe3c1c6dace44fa25a22c999ec6498576a8d8
Signed-off-by: Kevin Kane <kkane@microsoft.com>
resource/csdk/connectivity/api/cacommon.h
resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
resource/csdk/security/SConscript