diff options
| author | mh <mh@immerda.ch> | 2013-01-02 17:25:51 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2013-01-02 17:25:51 +0100 |
| commit | 8a96ea5cf05f45fe7d258f18f32aac9546b66bfc (patch) | |
| tree | f5c18bd5726362ededb9c5863936d9ce054795f3 /lib/facter | |
| parent | 33241a38d209817347f8086158beec23fd42a55b (diff) | |
| parent | 9465f48a6560f7d263931ec08618699dc44321f3 (diff) | |
Merge remote-tracking branch 'riseup/master'
Conflicts:
manifests/client.pp
manifests/server.pp
manifests/server/base.pp
manifests/server/cron/backup.pp
manifests/server/munin/default.pp
manifests/server/nagios.pp
Diffstat (limited to 'lib/facter')
0 files changed, 0 insertions, 0 deletions