Merge branch '1.3-rel' (f7bfd4a) 71/22471/2
authorGeorge Nash <george.nash@intel.com>
Thu, 14 Sep 2017 18:10:15 +0000 (11:10 -0700)
committerGeorge Nash <george.nash@intel.com>
Thu, 14 Sep 2017 18:10:15 +0000 (11:10 -0700)
commita7cb85abe19589bb1f7d5854dc18644c642766cc
tree0a58576559fb344c69610e8b0cecbff00311ee3f
parentda6952de0c0d5bb1dce6fc33b53ef2b5b0277715
parentf7bfd4a88cf9b76a63beec24998be517c7b1683a
Merge branch '1.3-rel' (f7bfd4a)

Relate-to:
https://gerrit.iotivity.org/gerrit/21973
https://gerrit.iotivity.org/gerrit/20987
https://gerrit.iotivity.org/gerrit/22021
https://gerrit.iotivity.org/gerrit/21991
https://gerrit.iotivity.org/gerrit/21871
https://gerrit.iotivity.org/gerrit/22017
https://gerrit.iotivity.org/gerrit/21577
https://gerrit.iotivity.org/gerrit/21987
https://gerrit.iotivity.org/gerrit/21985
https://gerrit.iotivity.org/gerrit/21603
https://gerrit.iotivity.org/gerrit/21711
https://gerrit.iotivity.org/gerrit/21843
https://gerrit.iotivity.org/gerrit/21925
https://gerrit.iotivity.org/gerrit/21983
https://gerrit.iotivity.org/gerrit/21937
https://gerrit.iotivity.org/gerrit/21935
https://gerrit.iotivity.org/gerrit/21933
https://gerrit.iotivity.org/gerrit/21931
https://gerrit.iotivity.org/gerrit/21929
https://gerrit.iotivity.org/gerrit/21923
https://gerrit.iotivity.org/gerrit/21921
https://gerrit.iotivity.org/gerrit/21901
https://gerrit.iotivity.org/gerrit/21965
https://gerrit.iotivity.org/gerrit/21959
https://gerrit.iotivity.org/gerrit/21887

Bug: https://jira.iotivity.org/browse/IOT-2453
Change-Id: I9eb36b18e1f9715b5e059b69de9e452f9e1c4334
Signed-off-by: George Nash <george.nash@intel.com>
24 files changed:
.gitignore
build_common/linux/SConscript
resource/csdk/include/octypes.h
resource/csdk/resource-directory/src/internal/rd_database.c
resource/csdk/resource-directory/src/rd_client.c
resource/csdk/resource-directory/src/rd_server.c
resource/csdk/security/provisioning/sample/provisioningclient.c
resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
resource/csdk/security/provisioning/src/ocprovisioningmanager.c
resource/csdk/security/provisioning/src/pmutility.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/src/credresource.c
resource/csdk/security/src/crlresource.c
resource/csdk/security/src/doxmresource.c
resource/csdk/stack/include/internal/ocstackinternal.h
resource/csdk/stack/include/ocpayload.h
resource/csdk/stack/src/occollection.c
resource/csdk/stack/src/ocpayload.c
resource/csdk/stack/src/ocresource.c
resource/csdk/stack/src/ocstack.c
resource/csdk/stack/src/oicresourcedirectory.c
resource/csdk/stack/test/stacktests.cpp
service/notification/unittest/oic_svr_db_ns.dat
service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp