Merge branch 'master' into windows-port 35/8435/1
authorDavid Antler <david.a.antler@intel.com>
Thu, 2 Jun 2016 17:59:35 +0000 (10:59 -0700)
committerDavid Antler <david.a.antler@intel.com>
Thu, 2 Jun 2016 17:59:35 +0000 (10:59 -0700)
commit5b285e73548cac989ef00461e1a96bc60b613ae1
treece59b653f4deb2ae6864a83c1b142b258b5cb77f
parent81955e9c075c87e751a24e9187c0fd6dcde4e864
parenta532c83b296610aa69a072ad78a2251759a50714
Merge branch 'master' into windows-port

Change-Id: Ideba675f1379a9044e9a7668ad72a34953d26767
Signed-off-by: David Antler <david.a.antler@intel.com>
23 files changed:
extlibs/tinydtls/dtls.c
extlibs/tinydtls/hmac.h
resource/csdk/connectivity/api/cacommon.h
resource/csdk/connectivity/src/ip_adapter/arduino/caipserver_eth.cpp
resource/csdk/connectivity/src/ip_adapter/arduino/caipserver_wifi.cpp
resource/csdk/connectivity/src/ip_adapter/caipserver.c
resource/csdk/security/provisioning/src/ownershiptransfermanager.c
resource/csdk/security/provisioning/src/pmutility.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/stack/include/octypes.h
resource/csdk/stack/include/payload_logging.h
resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp
resource/csdk/stack/samples/linux/secure/SConscript
resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp
resource/csdk/stack/src/occlientcb.c
resource/csdk/stack/src/ocresource.c
resource/csdk/stack/src/ocstack.c
resource/csdk/stack/test/stacktests.cpp
resource/include/AttributeValue.h
resource/include/OCApi.h
resource/include/OCRepresentation.h
resource/src/InProcClientWrapper.cpp
resource/src/OCRepresentation.cpp