diff options
| author | makefu <github@syntax-fehler.de> | 2013-01-14 14:46:22 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2013-01-14 14:46:22 +0100 |
| commit | dbe2d838ba6834788265029162b2dd7d82473335 (patch) | |
| tree | a4eb38f7fc91d91269b6f83453de62242c6ddc23 /Monitoring/collectd/supervisor.d | |
| parent | 5a782f6c8f7923f9f415afd504ce6e71acbc7fef (diff) | |
| parent | abf9916bc1add17888308877fa4eb9da330297ef (diff) | |
Merge branch 'master' of github.com:krebscode/painload
Conflicts:
god/temper/Makefile
god/temper/collectd-temper.sh
Diffstat (limited to 'Monitoring/collectd/supervisor.d')
| -rw-r--r-- | Monitoring/collectd/supervisor.d/collectd.conf | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Monitoring/collectd/supervisor.d/collectd.conf b/Monitoring/collectd/supervisor.d/collectd.conf deleted file mode 100644 index a6334d70..00000000 --- a/Monitoring/collectd/supervisor.d/collectd.conf +++ /dev/null @@ -1,3 +0,0 @@ -[program:collectd] -command=collectd -C /etc/collectd.conf -f -autorestart=true |