diff options
author | gnhb <gnoahb@gmail.com> | 2010-06-07 23:24:17 +0700 |
---|---|---|
committer | gnhb <gnoahb@gmail.com> | 2010-06-07 23:24:17 +0700 |
commit | 277d0250b0b344893c166df91cb66c2269ade1de (patch) | |
tree | 366643a754c140a34db43d4266c8a88b5ca49e60 /etc/inc/rrd.inc | |
parent | c1cc447c5d439e973f7d0915d95ad998c575eb65 (diff) | |
parent | 692730bf32b6658bee626c2bb58ffce54b7bcb14 (diff) | |
download | pfsense-277d0250b0b344893c166df91cb66c2269ade1de.zip pfsense-277d0250b0b344893c166df91cb66c2269ade1de.tar.gz |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp
Conflicts:
etc/inc/interfaces.inc
etc/inc/pfsense-utils.inc
Diffstat (limited to 'etc/inc/rrd.inc')
-rw-r--r-- | etc/inc/rrd.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/rrd.inc b/etc/inc/rrd.inc index 85221e6..98766e3 100644 --- a/etc/inc/rrd.inc +++ b/etc/inc/rrd.inc @@ -634,7 +634,7 @@ function enable_rrd_graphing() { } function kill_traffic_collector() { - mwexec("/bin/pkill -f updaterrd.sh"); + mwexec("/bin/pkill -f updaterrd.sh", true); } ?> |