projects / platform / core / system / resourced.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1d33e32 1a8875b)
Merge branch 'devel/tizen_2.4' into tizen 44/55544/1 accepted/tizen/mobile/20151229.072840 accepted/tizen/tv/20151229.072918 accepted/tizen/wearable/20151229.072940 submit/tizen/20151229.033448
authorPrajwal A N <an.prajwal@samsung.com>
Thu, 24 Dec 2015 10:25:00 +0000 (19:25 +0900)
committerPrajwal A N <an.prajwal@samsung.com>
Thu, 24 Dec 2015 10:25:00 +0000 (19:25 +0900)
commit215aedfa6be82d05c451188d1c1eab6894a21a6a
treeb93b2b2f1ca3e37b5f4d7b62f71104c7796e9d4atree | snapshot
parent1d33e321babe351da1d27f8e40e8152854bba9e9commit | diff
parent1a8875b574a641f4ba15320ab582b66100bc2051commit | diff
Merge branch 'devel/tizen_2.4' into tizen

* added CPU tests
* refactored test module
* removed secure coding issues

Signed-off-by: Prajwal A N <an.prajwal@samsung.com>
Conflicts:
packaging/resourced.spec
src/tests/network/resourced_data_usage_test.c
src/tests/proc-stat/resourced_proc_stat_test.c

Change-Id: I1aebe8558f933a258aced35c3c040ab8befe0ba2
12 files changed:
packaging/resourced.spec diff1 | diff2 | blob | history
src/CMakeLists.txt diff1 | diff2 | blob | history
src/block/block-monitor.c diff1 | diff2 | blob | history
src/heart/heart.c diff1 | diff2 | blob | history
src/heart/logging.c diff1 | diff2 | blob | history
src/memory/vmpressure-lowmem-handler.c diff1 | diff2 | blob | history
src/network/datausage-common.c diff1 | diff2 | blob | history
src/proc-stat/proc-appusage.c diff1 | diff2 | blob | history
src/proc-stat/proc-info.c diff1 | diff2 | blob | history
src/proc-stat/proc-main.c diff1 | diff2 | blob | history
src/swap/swap.c diff1 | diff2 | blob | history
src/timer-slack/timer-slack.c diff1 | diff2 | blob | history
Domain: System / System Framework;