Merge branch 1.3-rel (22cb0dbe) 67/20167/8
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Sat, 20 May 2017 10:22:22 +0000 (12:22 +0200)
committerPhil Coval <philippe.coval@osg.samsung.com>
Mon, 22 May 2017 15:36:51 +0000 (15:36 +0000)
commitd27d7f0bacec7650010a2e10a432b1282ffbf76d
tree2616b4ef6123f82ca1fc861c32584daf6909acd8
parenteecc4e36c55893c7233e2100c5886cc4ba4b4adc
parent22cb0dbee8741bb7fa6e6330c2e5047f530909c3
Merge branch 1.3-rel (22cb0dbe)

https://gerrit.iotivity.org/gerrit/19925

Change-Id: Ib63aa289e91cc5926946786ae2ce03525d83a37c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/20167/
resource/IPCA/samples/ElevatorClient/ElevatorClient.cpp
resource/IPCA/unittests/IPCAElevatorClient.cpp
resource/IPCA/unittests/ipcaunittests.cpp
resource/c_common/platform_features.h
resource/csdk/connectivity/test/ssladapter_test.cpp
resource/csdk/stack/octbstack_product_secured.def