diff options
| author | Luke Kanies <luke@madstop.com> | 2008-08-07 17:39:13 -0700 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-08-07 17:39:13 -0700 |
| commit | 113d74aaa630f499c8b7989aac6680e22e8e38c8 (patch) | |
| tree | 250783a4ef765ca37b70f98d6df6782f986d99ba /lib/puppet/network | |
| parent | 2cad30a18c5e0e4fb93603ab422c290a62d45131 (diff) | |
| download | puppet-113d74aaa630f499c8b7989aac6680e22e8e38c8.tar.gz puppet-113d74aaa630f499c8b7989aac6680e22e8e38c8.tar.xz puppet-113d74aaa630f499c8b7989aac6680e22e8e38c8.zip | |
Certificates now work over REST.
All of the format work is done, they all
support plaintext successfully, and I've got
integration tests that demonstrate that it
actually works.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet/network')
| -rw-r--r-- | lib/puppet/network/formats.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/puppet/network/formats.rb b/lib/puppet/network/formats.rb index bd171fa7d..e11748ce6 100644 --- a/lib/puppet/network/formats.rb +++ b/lib/puppet/network/formats.rb @@ -53,16 +53,14 @@ Puppet::Network::FormatHandler.create(:marshal, :mime => "text/marshal") do end end -Puppet::Network::FormatHandler.create(:str, :mime => "text/plain") do +Puppet::Network::FormatHandler.create(:s, :mime => "text/plain") do # For now, use the YAML separator. SEPARATOR = "\n---\n" - # Yaml doesn't need the class name; it's serialized. def intern_multiple(klass, text) text.split(SEPARATOR).collect { |inst| intern(klass, inst) } end - # Yaml monkey-patches Array, so this works. def render_multiple(instances) instances.collect { |inst| render(inst) }.join(SEPARATOR) end |
