Merge branch '1.3-rel' (112a21c5) 29/21129/7
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 30 Jun 2017 17:49:57 +0000 (19:49 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 30 Jun 2017 18:55:15 +0000 (20:55 +0200)
commit9003df0ac0bb58870ed315f035d0ace7bec290f3
tree5bdfe55cf7c92279219d3b4e4e0a68e9224b2471
parente300206c1dc7601d34d6a97c29b9ab1e61a1db8a
parent944946467b79a2d4886c8ebfa1616dfdc94ccc31
Merge branch '1.3-rel' (112a21c5)

Conflicts:
  auto_build.py
  build_common/SConscript
  build_common/android/SConscript
  build_common/arduino/SConscript
  build_common/windows/SConscript
  extlibs/gtest/SConscript
  resource/c_common/SConscript
  resource/c_common/unittests/SConscript
  resource/csdk/connectivity/build/android/SConscript
  resource/csdk/connectivity/src/SConscript
  resource/csdk/connectivity/test/SConscript
  resource/csdk/security/SConscript
  resource/csdk/security/provisioning/unittest/SConscript
  resource/csdk/security/provisioning/unittest/otmunittest.cpp
  resource/csdk/security/provisioning/unittest/sampleserver2.cpp
  resource/csdk/security/unittest/base64tests.cpp
  resource/csdk/stack/SConscript
  resource/csdk/stack/samples/tizen/build/SConscript
  resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec
  resource/csdk/stack/samples/tizen/build/scons/SConscript
  resource/csdk/stack/test/SConscript
  run.bat
  service/easy-setup/mediator/richsdk/unittests/SConscript
  service/notification/cpp-wrapper/unittest/SConscript
  service/notification/unittest/SConscript
  service/resource-container/unittests/SConscript
  service/resource-encapsulation/src/common/SConscript
  service/resource-encapsulation/src/common/primitiveResource/unittests/SConscript
  service/resource-encapsulation/src/serverBuilder/SConscript
  service/resource-encapsulation/unittests/SConscript
  service/third_party_libs.scons

Bug: https://jira.iotivity.org/browse/IOT-2453
Change-Id: Ic7d9c3881bf50102a1acccc60262c9545de468ad
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
28 files changed:
auto_build.py
build_common/android/SConscript
build_common/arduino/SConscript
build_common/windows/SConscript
extlibs/libcoap/SConscript
resource/IPCA/SConscript
resource/IPCA/unittests/SConscript
resource/c_common/SConscript
resource/csdk/connectivity/SConscript
resource/csdk/connectivity/build/android/SConscript
resource/csdk/connectivity/test/SConscript
resource/csdk/resource-directory/src/rd_client.c
resource/csdk/resource-directory/src/rd_server.c
resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
resource/csdk/security/provisioning/src/ownershiptransfermanager.c
resource/csdk/security/provisioning/unittest/SConscript
resource/csdk/security/provisioning/unittest/otmunittest.cpp
resource/csdk/security/provisioning/unittest/sampleserver.cpp
resource/csdk/security/src/credresource.c
resource/csdk/stack/include/ocpayload.h
resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp
resource/src/InProcServerWrapper.cpp
service/notification/unittest/SConscript
service/resource-encapsulation/src/common/primitiveResource/unittests/PrimitiveResourceTest.cpp
service/resource-encapsulation/src/serverBuilder/SConscript
service/resource-encapsulation/unittests/SConscript