projects / platform / upstream / iotivity.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7fbb9ad) | patch
Fix merge issues, Group action feature omit.
authorHyunJun Kim <hyunjun2.kim@samsung.com>
Tue, 14 Apr 2015 05:00:30 +0000 (14:00 +0900)
committerUze Choi <uzchoi@samsung.com>
Tue, 14 Apr 2015 10:28:56 +0000 (10:28 +0000)
commitfb9c7a7d875548a8fed59856b0688cdef864d7bd
tree764ce007dc98f7a174d405d5cb89c372b4e9e935tree | snapshot
parent7fbb9ad5804a5adb1e52eb79eafdbd586311679dcommit | diff
Fix merge issues, Group action feature omit.

Scheduled / Recursive Group Action feature was omitted
when CA and Master were Merged.

Change-Id: I0a850eef946fdc3612455fb57552e84991868bc8
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/711
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
resource/csdk/stack/include/internal/oicgroup.h diff | blob | history
resource/csdk/stack/src/oicgroup.c diff | blob | history
service/things-manager/sampleapp/linux/groupaction/groupserver.cpp diff | blob | history
service/things-manager/sdk/src/GroupManager.cpp diff | blob | history
service/things-manager/sdk/src/GroupSynchronization.cpp diff | blob | history
Domain: Network & Connectivity / IoT Connectivity;