Merge branch '1.3-rel' (9cff398) into 'master' 37/22837/3
authorGeorge Nash <george.nash@intel.com>
Fri, 13 Oct 2017 22:13:09 +0000 (15:13 -0700)
committerGeorge Nash <george.nash@intel.com>
Fri, 20 Oct 2017 21:32:33 +0000 (14:32 -0700)
commit952452d849a1af9537e72211771f4c35b5d3871b
tree1897de5321b42d482e13d5d9130c26ccddfbeeb6
parent68ca70e20ed9132d0a62b12dfabd2e246fcfbb41
parent9cff3985820ae87212710195aed6f860747afc0a
Merge branch '1.3-rel'  (9cff398) into 'master'

Relates-to:
https://gerrit.iotivity.org/gerrit/22743/
https://gerrit.iotivity.org/gerrit/22231/
https://gerrit.iotivity.org/gerrit/22621/
https://gerrit.iotivity.org/gerrit/22785/
https://gerrit.iotivity.org/gerrit/22703/
https://gerrit.iotivity.org/gerrit/22739/
https://gerrit.iotivity.org/gerrit/22793/
https://gerrit.iotivity.org/gerrit/22719/
https://gerrit.iotivity.org/gerrit/22777/
https://gerrit.iotivity.org/gerrit/22599/
https://gerrit.iotivity.org/gerrit/22329/
https://gerrit.iotivity.org/gerrit/22789/
https://gerrit.iotivity.org/gerrit/22741/
https://gerrit.iotivity.org/gerrit/22715/
https://gerrit.iotivity.org/gerrit/21945/
https://gerrit.iotivity.org/gerrit/22737/
https://gerrit.iotivity.org/gerrit/22725/
https://gerrit.iotivity.org/gerrit/22327/

Conflicts:
  resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c
  resource/csdk/security/src/pstatresource.c
  resource/csdk/stack/src/ocobserve.c
  resource/include/StringConstants.h
  resource/unittests/OCExceptionTest.cpp
  service/coap-http-proxy/unittests/CoAPHttpUnitTest.cpp
  service/resource-container/unittests/SConscript

Bug: https://jira.iotivity.org/browse/IOT-2453
Change-Id: I8a378b98876e916a3940fc707f3bfad1afcbf9c6
Signed-off-by: George Nash <george.nash@intel.com>
30 files changed:
build_common/linux/SConscript
resource/csdk/connectivity/common/inc/cacommonutil.h
resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c
resource/csdk/connectivity/test/ssladapter_test.cpp
resource/csdk/include/octypes.h
resource/csdk/resource-directory/src/internal/rd_database.c
resource/csdk/resource-directory/src/rd_server.c
resource/csdk/resource-directory/unittests/rdtests.cpp
resource/csdk/security/provisioning/sample/provisioningclient.c
resource/csdk/security/provisioning/sample/sampleserver_mfg.cpp
resource/csdk/security/provisioning/src/ocprovisioningmanager.c
resource/csdk/security/provisioning/src/ownershiptransfermanager.c
resource/csdk/security/provisioning/src/oxmpreconfpin.c
resource/csdk/security/provisioning/src/oxmrandompin.c
resource/csdk/security/src/credresource.c
resource/csdk/security/src/deviceonboardingstate.c
resource/csdk/security/src/pstatresource.c
resource/csdk/stack/octbstack_product_secured.def
resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp
resource/csdk/stack/src/occollection.c
resource/csdk/stack/src/ocobserve.c
resource/csdk/stack/src/ocpayload.c
resource/csdk/stack/src/ocresource.c
resource/csdk/stack/src/ocstack.c
resource/csdk/stack/test/stacktests.cpp
resource/provisioning/examples/provisioningclient.cpp
service/coap-http-proxy/unittests/CoAPHttpUnitTest.cpp
service/easy-setup/enrollee/src/resourcehandler.c
service/resource-container/unittests/SConscript