Merge branch 'master' into 'security-basecamp'
authorSachin Agrawal <sachin.agrawal@intel.com>
Wed, 5 Aug 2015 07:14:02 +0000 (00:14 -0700)
committerSachin Agrawal <sachin.agrawal@intel.com>
Wed, 5 Aug 2015 07:14:02 +0000 (00:14 -0700)
commit84ddde8349acc67db8f013a2f3737669d986bffc
treecac30389bddb50333fa84bfc0d07a6fb23cb3bcb
parent91d764e4c04861c1692f8a80f80ecc0706e59730
parentd7c2d7066ed86237f6aaac0c837969f12a5e2a62
Merge branch 'master' into 'security-basecamp'

Conflicts:
auto_build.sh
resource/csdk/security/include/internal/srmresourcestrings.h
resource/csdk/security/src/srmresourcestrings.c
resource/csdk/security/unittest/pstatresource.cpp
resource/csdk/stack/src/ocstack.c

Change-Id: I16af21ba19da38a5d0ec6d6ba0c236308f394676
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
13 files changed:
resource/csdk/connectivity/api/cainterface.h
resource/csdk/connectivity/inc/caadapternetdtls.h
resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c
resource/csdk/security/SConscript
resource/csdk/security/include/internal/srmresourcestrings.h
resource/csdk/security/src/amaclresource.c
resource/csdk/security/src/resourcemanager.c
resource/csdk/security/src/secureresourcemanager.c
resource/csdk/security/src/srmresourcestrings.c
resource/csdk/security/src/svcresource.c
resource/csdk/security/unittest/aclresourcetest.cpp
resource/csdk/security/unittest/pstatresource.cpp
resource/csdk/stack/src/ocstack.c