| commit | efa9b0fc0841cc5fb5dde11962f9c45db9ce4815 | |
| author | Holger Weiss <holger@zedat.fu-berlin.de> | |
| Mon, 26 Aug 2013 21:23:55 +0000 (26 23:23 +0200) | ||
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | |
| Mon, 26 Aug 2013 21:23:55 +0000 (26 23:23 +0200) | ||
| tree | 35b024c204e1c1b26b90ba1deccb0bc6d3b64c5d | treesnapshot (tar.gz zip) |
| parent | fae168a68b132b3a9e32e346342d23fff2b927f2 | commitdiff |
| parent | a6ff5d44895deb07c7978218eec6f7e1cbdfa94a | commitdiff |
Merge branch 'master' of https://github.com/bugness-chl/nagios-plugins
* 'master' of https://github.com/bugness-chl/nagios-plugins:
check_disk: option to ignore reserved space
Conflicts:
plugins/check_disk.c
* 'master' of https://github.com/bugness-chl/nagios-plugins:
check_disk: option to ignore reserved space
Conflicts:
plugins/check_disk.c
| plugins/check_disk.c | diff1 | diff2 | blobhistory |