Merge branch 'master' into security-summit
authorSachin Agrawal <sachin.agrawal@intel.com>
Wed, 16 Sep 2015 19:11:45 +0000 (12:11 -0700)
committerSachin Agrawal <sachin.agrawal@intel.com>
Wed, 16 Sep 2015 19:11:45 +0000 (12:11 -0700)
commitae6e681f3aa422e0bad2cc0cf706b54bde18bb1b
tree82df0850794cd4d06c4b1b738665a8066f63cd3e
parent5ab5f4abe291b8b0ff34ec0561ae9bb177058fe6
parent1f1ea9daf7f8e874ce24bdf17c17694da4f27325
Merge branch 'master' into security-summit

* master: (50 commits)
  Update the stack to use the new CoAP return code 2.04/2.05 values.
  resolve memory leak of ip monitor
  removed warning message for CA
  Add frag/defrag logic in EDR
  Add support for and handle presence of the coap ACCEPT option.
  Addressed endpoint pointer type mismatches in LE adapter.
  modify the OCTransportAdapter structure in RI
  apply smack rule and make resource samples package
  [Resource-Encapsulation] Updated Java SDK and RE Android Samples
  Enable error responses to be sent back to the client.
  Updated Android Sample App for block-wise transfer
  Enabled CoAP over TCP in RI Layer.
  [TIZEN] Updated properties of Configuration resource in Things manager.
  resource: Add test for ConstructResourceObject with InvalidUri
  [Services - Things Manager] Removed Things Manager class and exposed its component classes for SDK
  [Things-Manager] Updated Things Manager Sample Applications
  Fixed pointer-type arrays with NULL values
  Remove ifaddr files
  replaced some ERROR tag with DEBUG
  [TIZEN] Removed things manager class dependency from TIZEN SDK and used its component class.
  ...

Conflicts:
resource/csdk/security/src/aclresource.c
resource/csdk/security/src/doxmresource.c
resource/src/SConscript

Change-Id: I615c48ee6066873b9a5bb1dc27fff7e2490fb68f
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
resource/csdk/security/provisioning/src/provisioningdatabasemanager.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/src/aclresource.c
resource/csdk/security/src/credresource.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/unittest/aclresourcetest.cpp
resource/csdk/security/unittest/credentialresource.cpp
resource/csdk/security/unittest/doxmresource.cpp
resource/csdk/stack/include/octypes.h
resource/src/SConscript