Merge remote branch '1.3-rel' (80e11aa) 81/22581/3
authorGeorge Nash <george.nash@intel.com>
Fri, 29 Sep 2017 20:11:08 +0000 (13:11 -0700)
committerGeorge Nash <george.nash@intel.com>
Fri, 29 Sep 2017 20:11:08 +0000 (13:11 -0700)
commitc0de31991bdfa788603d4c870da9d726088effef
tree7f468cb8c1212149051c36f39d1636db0e355956
parente5f86d641de02dff8f0437961abe4295db83805a
parent80e11aa236bcdf675e440e42efb9c0d40eb2da43
Merge remote branch '1.3-rel' (80e11aa)

Relate-to:
https://gerrit.iotivity.org/gerrit/22139
https://gerrit.iotivity.org/gerrit/22281
https://gerrit.iotivity.org/gerrit/22277
https://gerrit.iotivity.org/gerrit/21615
https://gerrit.iotivity.org/gerrit/22537
https://gerrit.iotivity.org/gerrit/22517
https://gerrit.iotivity.org/gerrit/21449
https://gerrit.iotivity.org/gerrit/21781
https://gerrit.iotivity.org/gerrit/22507
https://gerrit.iotivity.org/gerrit/22521
https://gerrit.iotivity.org/gerrit/22499
https://gerrit.iotivity.org/gerrit/22223
https://gerrit.iotivity.org/gerrit/22437
https://gerrit.iotivity.org/gerrit/21489
https://gerrit.iotivity.org/gerrit/22353
https://gerrit.iotivity.org/gerrit/22455
https://gerrit.iotivity.org/gerrit/22363
https://gerrit.iotivity.org/gerrit/22483
https://gerrit.iotivity.org/gerrit/22429
https://gerrit.iotivity.org/gerrit/22469
https://gerrit.iotivity.org/gerrit/22011
https://gerrit.iotivity.org/gerrit/22007
https://gerrit.iotivity.org/gerrit/22407
https://gerrit.iotivity.org/gerrit/21837
https://gerrit.iotivity.org/gerrit/22299
https://gerrit.iotivity.org/gerrit/5473
https://gerrit.iotivity.org/gerrit/5441

Conflicts:
    resource/csdk/security/src/pconfresource.c
    resource/csdk/stack/samples/linux/secure/SConscript
    resource/csdk/stack/src/ocserverrequest.c
    resource/examples/SConscript
    resource/examples/oic_svr_db_client.dat
    resource/examples/oic_svr_db_server.dat
    resource/provisioning/unittests/OCProvisioningTest.cpp

Bug: https://jira.iotivity.org/browse/IOT-2453
Change-Id: I07efb0d1bd6c46ad2e413d1df106e37247206c46
Signed-off-by: George Nash <george.nash@intel.com>
56 files changed:
bridging/common/pluginServer.cpp
bridging/plugins/hue_plugin/hue_resource.cpp
bridging/plugins/lifx_plugin/lifxResource.cpp
bridging/plugins/lyric_plugin/honeywellResource.cpp
bridging/plugins/nest_plugin/nestResource.cpp
bridging/plugins/stub_plugin/stub_plugin.cpp
build_common/SConscript
java/SConscript
java/jni/JniOcPlatform.h
java/jni/JniOcProvisioning.cpp
java/jni/JniOcProvisioning.h
java/jni/JniOcSecureResource.cpp
java/jni/JniOcSecureResource.h
java/jni/JniOcStack.cpp
java/jni/SConscript
resource/IPCA/src/ocfframework.cpp
resource/IPCA/unittests/mockOCProvision.cpp
resource/csdk/include/octypes.h
resource/csdk/resource-directory/unittests/rdtests.cpp
resource/csdk/security/SConscript
resource/csdk/security/provisioning/sample/provisioningclient.c
resource/csdk/security/provisioning/src/ocprovisioningmanager.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/provisioning/unittest/otmunittest.cpp
resource/csdk/security/src/deviceonboardingstate.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/policyengine.c
resource/csdk/security/src/psinterface.c
resource/csdk/security/src/resourcemanager.c
resource/csdk/security/src/rolesresource.c
resource/csdk/security/src/secureresourcemanager.c
resource/csdk/security/tool/svrdbeditor_src/svrdbeditorcred.c
resource/csdk/security/unittest/SConscript
resource/csdk/stack/include/internal/ocstackinternal.h
resource/csdk/stack/include/ocpayload.h
resource/csdk/stack/octbstack_product.def
resource/csdk/stack/octbstack_product_secured.def
resource/csdk/stack/samples/linux/secure/SConscript
resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp
resource/csdk/stack/src/occollection.c
resource/csdk/stack/src/ocpayload.c
resource/csdk/stack/src/ocserverrequest.c
resource/csdk/stack/src/ocstack.c
resource/csdk/stack/test/stacktests.cpp
resource/examples/SConscript
resource/examples/oic_svr_db_client.dat
resource/examples/oic_svr_db_server.dat
resource/include/OCApi.h
resource/provisioning/examples/provisioningclient.cpp
resource/provisioning/examples/subownerclient.cpp
resource/provisioning/src/OCProvisioningManager.cpp
resource/provisioning/unittests/OCProvisioningTest.cpp
resource/src/InProcClientWrapper.cpp
resource/src/OCPlatform_impl.cpp
service/easy-setup/enrollee/src/resourcehandler.c
tools/tizen/iotivity.spec