]> gitweb.fluxo.info Git - puppet-backupninja.git/commitdiff
projects / puppet-backupninja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa28702 bab96a6)
Merge branch 'master' of https://git-nadir.immerda.ch/puppet-backupninja
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Fri, 6 Mar 2015 21:47:08 +0000 (16:47 -0500)
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Fri, 6 Mar 2015 21:47:08 +0000 (16:47 -0500)
Conflicts:
manifests/rdiff.pp

1  2 
manifests/rdiff.pp patch | diff1 | diff2 | blob | history

diff --cc manifests/rdiff.pp
Simple merge
Puppet module for backupninja