diff options
| author | varac <varacanero@zeromail.org> | 2015-04-17 19:45:31 +0000 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-04-17 19:45:31 +0000 |
| commit | 9930649228a509eda998699e213ed458685763f0 (patch) | |
| tree | 6924b541a294483ee8e6bfa6a196ca96e31dacfd /manifests/hostgroup.pp | |
| parent | 35d358a4cdf90b3cdc90904ca82b160e9c4376ac (diff) | |
| parent | 4ced0c5bbe605c322dc4103c3572ae18e69fa278 (diff) | |
Merge branch 'Dec2014merge' into 'master'
riseup Dec2014merge
riseup changes from the last few months, rebased to be easier to deal with.
adds:
* mrpe support (to replace nrpe)
* ps support (to replace statd)
* storing ssh keys in an alternate location
* update docs
* some bug fixes
See merge request !2
Diffstat (limited to 'manifests/hostgroup.pp')
0 files changed, 0 insertions, 0 deletions