Merge branch '1.3-rel' into 1.4-rel 13/24813/1
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 20 Apr 2018 15:23:16 +0000 (17:23 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 20 Apr 2018 15:24:34 +0000 (17:24 +0200)
commitee6a853cb3c384e1f3b1fa508fbad8192a876995
treeafdcea21393a92c800421b8f94355a554e5aa63a
parent811a49a882b09f00a8e6729fe855142b1400a0a7
parent0615f171b6bef5b1c8e413529022b5176888ca1e
Merge branch '1.3-rel' into 1.4-rel

Change-Id: I43209c55d6b5a6b7dc8ef8b1de8f49f2f8e7eb9a
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
34 files changed:
plugins/samples/linux/IotivityandZigbeeClient.c
plugins/samples/linux/IotivityandZigbeeServer.c
resource/IPCA/samples/ElevatorServer/elevatorserver.cpp
resource/csdk/resource-directory/samples/rd_publishingClient.cpp
resource/csdk/resource-directory/samples/rd_queryClient.cpp
resource/csdk/security/provisioning/sample/autoprovisioningclient.c
resource/csdk/security/provisioning/sample/certgenerator.cpp
resource/csdk/security/provisioning/sample/provisioningclient.c
resource/csdk/security/provisioning/sample/sampleserver_justworks.cpp
resource/csdk/security/provisioning/sample/sampleserver_mfg.cpp
resource/csdk/security/provisioning/sample/sampleserver_mvjustworks.cpp
resource/csdk/security/provisioning/sample/sampleserver_preconfpin.cpp
resource/csdk/security/provisioning/sample/sampleserver_randompin.cpp
resource/csdk/security/provisioning/sample/subownerclient.c
resource/csdk/security/provisioning/unittest/sampleserver.cpp
resource/csdk/stack/samples/linux/OCSample/occlient.c
resource/csdk/stack/samples/linux/OCSample/ocserver.c
resource/csdk/stack/samples/linux/SimpleClientServer/ocrouting.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocserverbasicops.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp
resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp
resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp
resource/csdk/stack/samples/tizen/SimpleClientServer/ocrouting.cpp
resource/csdk/stack/samples/tizen/SimpleClientServer/ocserver.cpp
resource/provisioning/examples/cloudAuth.cpp
resource/provisioning/examples/cloudClient.cpp
resource/provisioning/examples/cloudWrapper.cpp
resource/provisioning/examples/provisioningclient.cpp
resource/provisioning/examples/subownerclient.cpp
service/coap-http-proxy/samples/proxy_client.c
service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator.cpp
service/easy-setup/sampleapp/mediator/linux/richsdk_sample/submediator.cpp