Merge branch 'master' into 'security-basecamp'
authorSachin Agrawal <sachin.agrawal@intel.com>
Sun, 9 Aug 2015 19:00:18 +0000 (12:00 -0700)
committerSachin Agrawal <sachin.agrawal@intel.com>
Sun, 9 Aug 2015 19:00:18 +0000 (12:00 -0700)
commitc48947491784387cfb57b6dbd7cdc5ced803c6bc
tree92607fe93fb4483ee210ffd1ce60b21f4607b4b8
parentff305fc7799a5ab0f5253e31d73ba7776a150dda
parent32659ce806339bde2c3d1f4a149eecb0c25eaed3
Merge branch 'master' into 'security-basecamp'

Conflicts:
resource/csdk/security/src/aclresource.c
resource/csdk/security/unittest/doxmresource.cpp

Change-Id: Ic7ed242e7c394f40cfa13f5f353893aff66cb771
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
resource/csdk/connectivity/inc/caadapternetdtls.h
resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c
resource/csdk/security/src/aclresource.c
resource/csdk/security/src/credresource.c
resource/csdk/security/src/resourcemanager.c
resource/csdk/security/src/secureresourcemanager.c
resource/csdk/security/unittest/credentialresource.cpp
resource/csdk/security/unittest/doxmresource.cpp
resource/csdk/security/unittest/srmutility.cpp
resource/csdk/stack/src/ocstack.c