Merge branch '1.3-rel' (0a92c096) 75/21575/1
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 21 Jul 2017 11:45:18 +0000 (13:45 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 21 Jul 2017 11:45:27 +0000 (13:45 +0200)
commite34afbffc649fac807628bac46a33c2870840ec1
tree45d323d23544b4cc823184b4914742d949ba45c9
parente450d10699a504c90cb37fba3e9a551d93278e25
parent0a92c0968c59eae7bae4e94e888124211ecf1bd0
Merge branch '1.3-rel' (0a92c096)

Relate-to:
https://gerrit.iotivity.org/gerrit/17033
https://gerrit.iotivity.org/gerrit/21509
https://gerrit.iotivity.org/gerrit/21543
https://gerrit.iotivity.org/gerrit/21455
https://gerrit.iotivity.org/gerrit/21569
https://gerrit.iotivity.org/gerrit/21315
https://gerrit.iotivity.org/gerrit/21515
https://gerrit.iotivity.org/gerrit/21527

Change-Id: I0a92c0968c59eae7bae4e94e888124211ecf1bd0
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
resource/csdk/security/src/credresource.c
resource/csdk/stack/test/stacktests.cpp