diff options
| author | Luke Kanies <luke@madstop.com> | 2008-06-14 21:32:10 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-06-14 21:32:10 -0500 |
| commit | 7b10c39bdc20cad3d4652008c404d576461d75e1 (patch) | |
| tree | dcc2be944f00b40ad213ba254c712f2677522391 /lib/puppet/ssl/base.rb | |
| parent | 6a61198f9293674a4bf0aa75bfbca10e20f64d20 (diff) | |
| parent | 575f37a0656f5a1f94fe6fb1b189d1701a98cadc (diff) | |
| download | puppet-7b10c39bdc20cad3d4652008c404d576461d75e1.tar.gz puppet-7b10c39bdc20cad3d4652008c404d576461d75e1.tar.xz puppet-7b10c39bdc20cad3d4652008c404d576461d75e1.zip | |
Merge branch '0.24.x'
Conflicts:
lib/puppet/executables/client/certhandler.rb
spec/unit/executables/client/certhandler.rb
Diffstat (limited to 'lib/puppet/ssl/base.rb')
0 files changed, 0 insertions, 0 deletions