Merge branch 'master' into cloud-interface 37/5137/9
authorJee Hyeok Kim <jihyeok13.kim@samsung.com>
Fri, 26 Feb 2016 06:06:51 +0000 (15:06 +0900)
committerJee Hyeok Kim <jihyeok13.kim@samsung.com>
Fri, 26 Feb 2016 06:10:22 +0000 (15:10 +0900)
commit45c364268c4f5d575d98f4cd88b571b536c6cb17
tree7f4b7d95e1237c4f05d202781d860b6786cc41b5
parent193ac144d877c161b7118152671693b1c420060f
parent586aa4993a002dcd453846102d212086c8c78111
Merge branch 'master' into cloud-interface

Change-Id: Ifa74665a1750fb1671a8035f7321557cd6d2403f
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
resource/csdk/security/SConscript
resource/csdk/security/include/internal/srmresourcestrings.h
resource/csdk/security/include/securevirtualresourcetypes.h
resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
resource/csdk/security/provisioning/src/pmutility.c
resource/csdk/security/src/iotvticalendar.c
resource/csdk/security/src/srmresourcestrings.c
resource/csdk/security/unittest/iotvticalendartest.cpp
resource/csdk/stack/src/ocstack.c
service/resource-encapsulation/examples/linux/SampleResourceClient.cpp
service/resource-encapsulation/src/resourceClient/RCSDiscoveryManager.cpp