diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-02 15:36:17 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-02 15:36:17 -0700 |
| commit | 8b28417f696bd7d34ea4212a89913b5e796993c7 (patch) | |
| tree | 228c6f9eccd5a91abfcf4fc7aecba0e68e00ac65 /lib/puppet | |
| parent | 25ee3d62bdd6c1e835f74eb9aa5f2e03e6b570df (diff) | |
| parent | a4a274b8c7807fdf35199dc20889de599ea912ca (diff) | |
| download | puppet-8b28417f696bd7d34ea4212a89913b5e796993c7.tar.gz puppet-8b28417f696bd7d34ea4212a89913b5e796993c7.tar.xz puppet-8b28417f696bd7d34ea4212a89913b5e796993c7.zip | |
Merge branch 'bug/2.7.x/7315-puppet-status-can't-render-as-json' into 2.7.x
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/status.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/status.rb b/lib/puppet/status.rb index eecd0e18c..ea6a601f3 100644 --- a/lib/puppet/status.rb +++ b/lib/puppet/status.rb @@ -10,7 +10,7 @@ class Puppet::Status @status = status || {"is_alive" => true} end - def to_pson + def to_pson(*args) @status.to_pson end |