Merge branch '1.3-rel' (0d609e16) 41/21841/1
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Thu, 10 Aug 2017 06:06:19 +0000 (08:06 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Thu, 10 Aug 2017 06:06:23 +0000 (08:06 +0200)
commit9a02aef0954c332c7bb64e1188517d5e14220577
treeb7e5feb2bd15188aa6ad2f4e0aee5b0f4770cd38
parentbd34290526ec305b6899bd303c2e3f97a76f3147
parent0d609e1639ca9bf4a08e6cf765e17ad5d6e36bda
Merge branch '1.3-rel' (0d609e16)

Relate-to:
https://gerrit.iotivity.org/gerrit/21713
https://gerrit.iotivity.org/gerrit/21601
https://gerrit.iotivity.org/gerrit/21621
https://gerrit.iotivity.org/gerrit/21741
https://gerrit.iotivity.org/gerrit/17411
https://gerrit.iotivity.org/gerrit/21555

Change-Id: I0d609e1639ca9bf4a08e6cf765e17ad5d6e36bda
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp