aboutsummaryrefslogtreecommitdiff
path: root/manifests/rdiff.pp
diff options
context:
space:
mode:
authorGabriel Filion <gabster@lelutin.ca>2015-03-06 17:47:09 -0500
committerGabriel Filion <gabster@lelutin.ca>2015-03-06 17:47:09 -0500
commitb2c9640c654b0d9ba2f5949ef53480c855a6d1f0 (patch)
tree37611e2ca83b20f594ea2d3cbf1316c91437c738 /manifests/rdiff.pp
parent21d8dc8652a9e8910914940cc439e7a02efbf39e (diff)
parentaaa21c19b69d381becc1d801d6664b71ba0db525 (diff)
downloadpuppet-backupninja-b2c9640c654b0d9ba2f5949ef53480c855a6d1f0.tar.gz
puppet-backupninja-b2c9640c654b0d9ba2f5949ef53480c855a6d1f0.tar.bz2
Merge remote-tracking branch 'mayfirst/master' into merge_mayfirst
Conflicts: manifests/mysql.pp manifests/pgsql.pp templates/pgsql.conf.erb
Diffstat (limited to 'manifests/rdiff.pp')
0 files changed, 0 insertions, 0 deletions