diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-03-06 16:51:24 -0500 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-03-06 16:51:24 -0500 |
| commit | 21d8dc8652a9e8910914940cc439e7a02efbf39e (patch) | |
| tree | ea01014a9257ffbb70191c7360a521f3db2402ea /templates/sys.conf.erb | |
| parent | 1ef94f1f2e49e032c6c416830345fc3b4beacb01 (diff) | |
| parent | b8a4f91cf2c6292d52fb9a8372292cc5a142b92d (diff) | |
Merge branch 'master' of git://git.sarava.org/puppet-backupninja
Conflicts:
manifests/client.pp
manifests/rdiff.pp
Diffstat (limited to 'templates/sys.conf.erb')
0 files changed, 0 insertions, 0 deletions