]> gitweb.fluxo.info Git - puppet-backupninja.git/commitdiff
projects / puppet-backupninja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fee18a9 4975135)
Merge remote-tracking branch 'shared/master' into develop
authorSilvio Rhatto <rhatto@riseup.net>
Sat, 19 Mar 2016 14:22:26 +0000 (11:22 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Sat, 19 Mar 2016 14:22:26 +0000 (11:22 -0300)
Conflicts:
templates/backupninja.conf.erb
templates/sh.conf.erb


Trivial merge
Puppet module for backupninja