Merge branch 'security-basecamp' into master 58/2258/1
authorSachin Agrawal <sachin.agrawal@intel.com>
Fri, 21 Aug 2015 19:28:37 +0000 (12:28 -0700)
committerSachin Agrawal <sachin.agrawal@intel.com>
Fri, 21 Aug 2015 19:28:37 +0000 (12:28 -0700)
commit6dac22e4428a50d74a11603436b95650c22bc11f
treea92fddf737abc9f07b5e0f6f71fa1da2e9514bcf
parent054a7873e98240f3016fe404186aff95371c7440
parenta630ab89a5e3a0cba260e695d26376efd429bba1
Merge branch 'security-basecamp' into master

Conflicts:
resource/csdk/connectivity/api/cainterface.h
resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp

Change-Id: I3f49aaa0a1e23f1e361f9f2aa3ceaa5a2acd6aef
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
resource/csdk/connectivity/api/cainterface.h
resource/csdk/connectivity/inc/caadapternetdtls.h
resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c
resource/csdk/security/src/secureresourcemanager.c