diff options
author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-05-07 13:59:28 -0400 |
---|---|---|
committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-05-07 14:00:00 -0400 |
commit | e465032ecc82979ae8e4dce074970cb03273fe7d (patch) | |
tree | e6b2e2674862cdcaa414fefac461212485c38d55 /manifests/generate_sshkey.pp | |
parent | fbddc25ee6e813ceffa88192fb607e63cebf8bba (diff) | |
parent | 873eb70ef87abfeaace2f4b0020626d01ad1bfe5 (diff) | |
download | puppet-backupninja-e465032ecc82979ae8e4dce074970cb03273fe7d.tar.gz puppet-backupninja-e465032ecc82979ae8e4dce074970cb03273fe7d.tar.bz2 |
Merge branch 'multi-backup'
Conflicts:
README
See merge request !5
Diffstat (limited to 'manifests/generate_sshkey.pp')
0 files changed, 0 insertions, 0 deletions