diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-03-23 13:19:53 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-03-23 13:19:53 -0700 |
| commit | 36f4dc5e1527fc46f097080c12bb1ee5c3d46714 (patch) | |
| tree | 1f1a5547aac5eb338f274a786f4d56db32aec7a2 /lib/puppet/external | |
| parent | ad85b67ade99a3ec4ed4a8e578c9d288706b567d (diff) | |
| parent | 36a5665f3e0aeb8b9141cb8be2f69f8568078986 (diff) | |
Merge branch 'ticket/next/6820_ruby19_fixes' into next
* ticket/next/6820_ruby19_fixes:
(#6820) Fix File class lookup in the file type for Ruby 1.9
(#6820) Fix nagios parser to use proper hash syntax for Ruby 1.9
(#6820) Fix Invalid multibyte character
(#6820) Fix RDOC parser to work with Ruby 1.9
(#6820) Fix invalid next that should be a return
(#2782) Fix constant_defined?
Diffstat (limited to 'lib/puppet/external')
| -rw-r--r-- | lib/puppet/external/nagios/parser.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/external/nagios/parser.rb b/lib/puppet/external/nagios/parser.rb index 5504f5818..17db5e307 100644 --- a/lib/puppet/external/nagios/parser.rb +++ b/lib/puppet/external/nagios/parser.rb @@ -753,7 +753,7 @@ module_eval <<'.,.,', 'grammar.ry', 40 module_eval <<'.,.,', 'grammar.ry', 42 def _reduce_10( val, _values, result ) -result = {val[0],val[1]} +result = {val[0] => val[1]} result end .,., |