Merge branch 'master' into iot-1785
authorKevin Kane <kkane@microsoft.com>
Fri, 31 Mar 2017 19:41:13 +0000 (12:41 -0700)
committerKevin Kane <kkane@microsoft.com>
Fri, 31 Mar 2017 19:58:15 +0000 (12:58 -0700)
commitc21b6f5a05cc41eb347f2022a1b2a4bbfb4df93e
tree788c6c1a5712520a823349243476015293fceb0d
parentaa112923b53234a4f013e847b6b00bfcd3be4a4a
parent94b86083c1f59b9fab19538488ea6c9f08c3b3d1
Merge branch 'master' into iot-1785

Conflicts:

    resource\csdk\security\include\internal\acl_logging.h
    resource\csdk\security\src\aclresource.c

Change-Id: Ide5322ac5c02c82af08586c4dc2fb2ec80b1b301
Signed-off-by: Kevin Kane <kkane@microsoft.com>
resource/csdk/connectivity/src/camessagehandler.c
resource/csdk/security/SConscript
resource/csdk/security/include/internal/acl_logging.h
resource/csdk/security/include/internal/aclresource.h
resource/csdk/security/provisioning/sample/SConscript
resource/csdk/security/provisioning/src/cloud/aclid.c
resource/csdk/security/provisioning/src/ownershiptransfermanager.c
resource/csdk/security/src/aclresource.c