Merge branch 'master' into windows-port
authorDavid Antler <david.a.antler@intel.com>
Wed, 15 Jun 2016 16:57:49 +0000 (09:57 -0700)
committerDavid Antler <david.a.antler@intel.com>
Wed, 15 Jun 2016 16:57:49 +0000 (09:57 -0700)
commita214f7d5b1f3c97e4ba731577e7297f14c5ef8b9
tree1386f3fec416d5963922536adc6a65a225480060
parentb977ebaabf86148935a1ed7f6f0f18a30eb145ca
parentfb7b7a81d5fa045caf1c879fa49cef951dfeaae7
Merge branch 'master' into windows-port

Needed to disable provisioning unit test due to introduction of
complex Linux dependencies.

Change-Id: I4bd864cd7dc134bf7fb2faa8398f9f4afab40937
Signed-off-by: David Antler <david.a.antler@intel.com>
23 files changed:
build_common/SConscript
resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c
resource/csdk/security/provisioning/src/pmutility.c
resource/csdk/security/provisioning/unittest/SConscript
resource/csdk/security/src/directpairing.c
resource/csdk/security/unittest/SConscript
resource/csdk/stack/include/ocpayload.h
resource/csdk/stack/include/ocstack.h
resource/csdk/stack/include/octypes.h
resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp
resource/csdk/stack/samples/linux/secure/occlientdirectpairing.cpp
resource/csdk/stack/src/ocpayload.c
resource/csdk/stack/src/ocpayloadconvert.c
resource/csdk/stack/src/ocresource.c
resource/csdk/stack/src/ocstack.c
resource/csdk/stack/test/stacktests.cpp
resource/examples/SConscript
resource/examples/directpairingclient.cpp
resource/include/OCApi.h
resource/src/InProcClientWrapper.cpp
resource/src/OCResource.cpp
resource/src/SConscript
resource/unit_tests.scons