Merge remote branch '1.3-rel'(38203e6) 47/22647/2
authorGeorge Nash <george.nash@intel.com>
Fri, 29 Sep 2017 21:06:27 +0000 (14:06 -0700)
committerGeorge Nash <george.nash@intel.com>
Fri, 29 Sep 2017 21:06:27 +0000 (14:06 -0700)
commitefdffbcfa92076c6ff6a4bf691bb986ae3c5378c
treee6188c93c6bdb7909807ad6e288a463e66d0edd4
parentc0de31991bdfa788603d4c870da9d726088effef
parent38203e614aefc1c457dd8b78f580706568fa72cf
Merge remote branch '1.3-rel'(38203e6)

Relate-to:
https://gerrit.iotivity.org/gerrit/22591/
https://gerrit.iotivity.org/gerrit/22515/
https://gerrit.iotivity.org/gerrit/22585/
https://gerrit.iotivity.org/gerrit/22627/
https://gerrit.iotivity.org/gerrit/22399/
https://gerrit.iotivity.org/gerrit/22579/
https://gerrit.iotivity.org/gerrit/22563/
https://gerrit.iotivity.org/gerrit/21327/
https://gerrit.iotivity.org/gerrit/22571/
https://gerrit.iotivity.org/gerrit/22555/
https://gerrit.iotivity.org/gerrit/22611/
https://gerrit.iotivity.org/gerrit/22595/
https://gerrit.iotivity.org/gerrit/22409/
https://gerrit.iotivity.org/gerrit/22557/

Conflicts:
  resource/third_party_libs.scons
  service/easy-setup/enrollee/unittests/ESEnrolleeTest.cpp
  service/notification/SConscript
  service/notification/cpp-wrapper/consumer/SConscript
  service/notification/cpp-wrapper/examples/linux/SConscript
  service/notification/cpp-wrapper/provider/SConscript
  service/notification/examples/linux/SConscript
  service/third_party_libs.scons

Bug: https://jira.iotivity.org/browse/IOT-2453
Change-Id: Ie1f359fb1793bc9d746d21fab5865b98e0b5c48d
Signed-off-by: George Nash <george.nash@intel.com>
54 files changed:
bridging/common/SConscript
bridging/common/messageHandler.cpp
bridging/mini_plugin_manager/SConscript
bridging/mpm_client/SConscript
bridging/plugins/hue_plugin/SConscript
bridging/plugins/lifx_plugin/SConscript
bridging/plugins/lyric_plugin/SConscript
bridging/plugins/nest_plugin/SConscript
build_common/SConscript
plugins/src/SConscript
plugins/zigbee_wrapper/src/SConscript
resource/csdk/include/octypes.h
resource/csdk/resource-directory/SConscript
resource/csdk/security/provisioning/sample/SConscript
resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
resource/csdk/security/provisioning/src/ocprovisioningmanager.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/src/aclresource.c
resource/csdk/security/src/amaclresource.c
resource/csdk/security/src/certhelpers.c
resource/csdk/security/src/credresource.c
resource/csdk/security/src/crlresource.c
resource/csdk/security/src/csrresource.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/psinterface.c
resource/csdk/security/src/pstatresource.c
resource/csdk/security/src/rolesresource.c
resource/csdk/security/tool/SConscript
resource/csdk/security/tool/json2cbor.c
resource/csdk/stack/SConscript
resource/csdk/stack/include/ocpayload.h
resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec
resource/csdk/stack/src/ocpayloadconvert.c
resource/csdk/stack/src/ocpayloadparse.c
resource/csdk/stack/src/ocserverrequest.c
resource/csdk/stack/src/ocstack.c
resource/examples/oic_svr_db_client.dat
resource/examples/oic_svr_db_server.dat
resource/provisioning/examples/SConscript
resource/third_party_libs.scons
service/easy-setup/mediator/richsdk/SConscript
service/easy-setup/mediator/richsdk/inc/ESRichCommon.h
service/easy-setup/mediator/richsdk/src/EnrolleeResource.cpp
service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/SConscript
service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript
service/notification/SConscript
service/notification/cpp-wrapper/consumer/SConscript
service/notification/cpp-wrapper/examples/linux/SConscript
service/notification/cpp-wrapper/provider/SConscript
service/notification/examples/linux/SConscript
service/simulator/SConscript
service/third_party_libs.scons
tools/tizen/iotivity.spec