Merge branch '1.3-rel' (423eb833) 57/21557/3
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Thu, 20 Jul 2017 10:43:47 +0000 (12:43 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Thu, 20 Jul 2017 10:43:52 +0000 (12:43 +0200)
commitcc7956101c67073e36306217e141d07e34333445
tree1146a7583b39bd0c7dc699d747faebe39812f288
parent910ec0aee5be2cc83488eaddb3e8fe599776b94a
parent423eb833e348fe94b98793da7e226afd28ab0236
Merge branch '1.3-rel' (423eb833)

Relate-to:
https://gerrit.iotivity.org/gerrit/20829
https://gerrit.iotivity.org/gerrit/21387
https://gerrit.iotivity.org/gerrit/18679
https://gerrit.iotivity.org/gerrit/21139
https://gerrit.iotivity.org/gerrit/21403
https://gerrit.iotivity.org/gerrit/21433
https://gerrit.iotivity.org/gerrit/21503

Change-Id: I423eb833e348fe94b98793da7e226afd28ab0236
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/src/ocserverrequest.c