diff options
| author | Antoine Beaupre <anarcat@koumbit.org> | 2008-12-08 16:24:43 -0500 |
|---|---|---|
| committer | Antoine Beaupre <anarcat@koumbit.org> | 2008-12-08 16:24:43 -0500 |
| commit | d61e1c60fabc102103b0fa79450ed6a5ca0da0ca (patch) | |
| tree | c34c29c49ba15a2fc56d87343c38984d02444f7a /manifests/server.pp | |
| parent | f51344acc8a55fe2dd0b9b17331e913d6ef723d0 (diff) | |
| parent | 72493d7caa635eb8ef210bc0a402b5579f85d98c (diff) | |
| download | puppet-backupninja-d61e1c60fabc102103b0fa79450ed6a5ca0da0ca.tar.gz puppet-backupninja-d61e1c60fabc102103b0fa79450ed6a5ca0da0ca.tar.bz2 | |
Merge commit 'micah/master'
Conflicts:
templates/rdiff.conf.erb
Diffstat (limited to 'manifests/server.pp')
0 files changed, 0 insertions, 0 deletions