]> arthur.barton.de Git - netdata.git/commit
Merge remote-tracking branch 'fredericopissarra/changes' into registry
authorCosta Tsaousis <costa@tsaousis.gr>
Fri, 13 May 2016 17:08:47 +0000 (20:08 +0300)
committerCosta Tsaousis <costa@tsaousis.gr>
Fri, 13 May 2016 17:08:47 +0000 (20:08 +0300)
commit9dc4407074b37a1f0712dbbf8b34a0e5284fd018
treef6e1c5d4e4fea00e6163ac341880ed2d47f982c6
parentac9eb75046a2136a1835c7e3d89aae99d58901c0
parent5e9d5dfaec245789ffe4e02cdfa5b62d436201d3
Merge remote-tracking branch 'fredericopissarra/changes' into registry

Conflicts:
src/common.c
src/web_client.c
src/apps_plugin.c
src/common.c
src/common.h
src/main.c
src/plugin_tc.c
src/proc_interrupts.c
src/proc_softirqs.c
src/rrd.c
src/sys_fs_cgroup.c
src/web_client.c