diff options
| author | Micah Anderson <micah@riseup.net> | 2009-08-27 19:47:12 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2009-08-27 19:47:12 -0400 |
| commit | 08d43f8c6d6a60f456cb82f2fb270f48470c96d7 (patch) | |
| tree | a178e6a1adc2adaba86d9ed08ca007fad97a7aa1 /manifests/dup.pp | |
| parent | 8c72b1b43a428ccebb2b629ed60f06ff71650c17 (diff) | |
| parent | 6734c256525e1dd42ba3648db82083bcabca66ed (diff) | |
| download | puppet-backupninja-08d43f8c6d6a60f456cb82f2fb270f48470c96d7.tar.gz puppet-backupninja-08d43f8c6d6a60f456cb82f2fb270f48470c96d7.tar.bz2 | |
Merge commit '6734c256525e1dd42ba3648db82083bcabca66ed'
Conflicts:
manifests/dup.pp
Diffstat (limited to 'manifests/dup.pp')
| -rw-r--r-- | manifests/dup.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/dup.pp b/manifests/dup.pp index c4554ee..5e58c2b 100644 --- a/manifests/dup.pp +++ b/manifests/dup.pp @@ -79,7 +79,7 @@ define backupninja::duplicity( $order = 90, $destuser = false, # configs to backupninja client $backupkeystore = false, - $backupkeytype = false, + $backupkeytype = '', # options to backupninja server sandbox $ssh_dir_manage = true, $ssh_dir = false, |