Merge branch '1.3-rel' (8d47169c) 21/21521/2
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Tue, 18 Jul 2017 17:25:15 +0000 (19:25 +0200)
committerPhil Coval <philippe.coval@osg.samsung.com>
Wed, 19 Jul 2017 14:40:10 +0000 (14:40 +0000)
commitc4e0c3ca5ddea2ae03aa2508a5d055a859000545
treea4c4069e746bdff841baa28d3f44760bd3d21858
parent1ccdedfabd91be9da2142687103c79a016720876
parent8d47169c0de2270a8cdfe4e0ac727140e882bf31
Merge branch '1.3-rel' (8d47169c)

Master was prefered because R-E was fixed in master but not in 1.3-rel.

Conflicts:
        service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp

Relate-to:
        https://gerrit.iotivity.org/gerrit/18033
        https://jira.iotivity.org/browse/IOT-2267

Change-Id: I8d47169c0de2270a8cdfe4e0ac727140e882bf31
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
java/jni/SConscript
resource/csdk/stack/src/ocresource.c
service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp