aboutsummaryrefslogtreecommitdiff
path: root/manifests/sh.pp
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-03-06 16:47:08 -0500
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-03-06 16:47:08 -0500
commit1ef94f1f2e49e032c6c416830345fc3b4beacb01 (patch)
tree4c6bc037e48bcfc75412d86f638e2cdbc118d8c7 /manifests/sh.pp
parentfa28702f46db802494872272ca50e0b1c37de09e (diff)
parentbab96a631337b87dd6f168f663f5b24537f58a5c (diff)
downloadpuppet-backupninja-1ef94f1f2e49e032c6c416830345fc3b4beacb01.tar.gz
puppet-backupninja-1ef94f1f2e49e032c6c416830345fc3b4beacb01.tar.bz2
Merge branch 'master' of https://git-nadir.immerda.ch/puppet-backupninja
Conflicts: manifests/rdiff.pp
Diffstat (limited to 'manifests/sh.pp')
0 files changed, 0 insertions, 0 deletions