projects / platform / upstream / iotivity.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c0c4429) | patch
Cloud ACL Management (cherry-pick conflict solve)
authorJongmin Choi <jminl.choi@samsung.com>
Tue, 13 Sep 2016 09:20:54 +0000 (18:20 +0900)
committerJee Hyeok Kim <jihyeok13.kim@samsung.com>
Tue, 20 Sep 2016 08:16:35 +0000 (08:16 +0000)
commit0e17894cb5b96d85ea942ea8b10f8647fad57746
tree6d9186b4ba33180effe27da85df7829029f7552etree | snapshot
parentc0c4429b227a8591c1a438174720af47b2c21dc7commit | diff
Cloud ACL Management (cherry-pick conflict solve)

Resolve conflicts between cloud-interface, master and 1.2-rel

Change-Id: I1a6c1a8059befdcea1017c826ae77a1900a4d2db
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11943
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
cloud/account/src/main/java/org/iotivity/cloud/accountserver/db/MongoDB.java diff | blob | history
Domain: Network & Connectivity / IoT Connectivity;