Merge branch '1.3-rel' (9fa8739) 75/22475/2
authorGeorge Nash <george.nash@intel.com>
Thu, 14 Sep 2017 20:31:30 +0000 (13:31 -0700)
committerGeorge Nash <george.nash@intel.com>
Thu, 14 Sep 2017 20:31:30 +0000 (13:31 -0700)
commit517577ce4804ab1b794f98dc6a31ebb649590a7e
tree79c211052d32d59d8b892c30f8a9e2729532a761
parenta7cb85abe19589bb1f7d5854dc18644c642766cc
parent9fa87391050797e5bebba6204083e1f157a0949e
Merge branch '1.3-rel' (9fa8739)

Relate-to:
https://gerrit.iotivity.org/gerrit/22035
https://gerrit.iotivity.org/gerrit/21947
https://gerrit.iotivity.org/gerrit/21941
https://gerrit.iotivity.org/gerrit/21291
https://gerrit.iotivity.org/gerrit/21943
https://gerrit.iotivity.org/gerrit/21227
https://gerrit.iotivity.org/gerrit/21885
https://gerrit.iotivity.org/gerrit/22113
https://gerrit.iotivity.org/gerrit/22039
https://gerrit.iotivity.org/gerrit/22041
https://gerrit.iotivity.org/gerrit/21325

Conflicts:
resource/IPCA/unittests/SConscript
resource/csdk/security/unittest/oic_svr_db.json
resource/csdk/security/unittest/oic_unittest.dat
resource/provisioning/unittests/SConscript
resource/unittests/SConscript
service/notification/unittest/SConscript

Bug: https://jira.iotivity.org/browse/IOT-2453
Change-Id: I75cd5c596cfa0277a55dc3e51b5678184c03881d
Signed-off-by: George Nash <george.nash@intel.com>
15 files changed:
build_common/SConscript
resource/IPCA/unittests/SConscript
resource/csdk/security/include/internal/crl_logging.h
resource/csdk/security/src/pstatresource.c
resource/csdk/security/src/rolesresource.c
resource/csdk/stack/src/occollection.c
resource/provisioning/unittests/SConscript
resource/unittests/SConscript
service/easy-setup/enrollee/unittests/SConscript
service/easy-setup/sampleapp/enrollee/linux/SConscript
service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript
service/notification/unittest/NSProviderTest.cpp
service/notification/unittest/SConscript
service/resource-encapsulation/src/resourceCache/unittests/SConscript
service/resource-encapsulation/unittests/SConscript