diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-02-03 21:22:47 -0800 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-02-03 21:33:17 -0800 |
| commit | fd0bfdec4512ee0927be6c181e99b96be26363aa (patch) | |
| tree | 367fc836352dca49abca847bfd46d8251ba76bae /lib | |
| parent | d64f4a9024d738d9184f822f1d26e404a403d256 (diff) | |
| parent | 70a43c4b0d3018a39e29c50b1caf7dec38694323 (diff) | |
| download | puppet-fd0bfdec4512ee0927be6c181e99b96be26363aa.tar.gz puppet-fd0bfdec4512ee0927be6c181e99b96be26363aa.tar.xz puppet-fd0bfdec4512ee0927be6c181e99b96be26363aa.zip | |
Merge branch '2.6.x' into next
Conflicts:
lib/puppet/util/zaml.rb
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/util/zaml.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb index a58d3c801..5c3e7f18b 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -24,7 +24,7 @@ require 'puppet/util/run_mode' # it's also a place to find top-level commands like 'debug' module Puppet - PUPPETVERSION = '2.6.4' + PUPPETVERSION = '2.6.5' def Puppet.version PUPPETVERSION diff --git a/lib/puppet/util/zaml.rb b/lib/puppet/util/zaml.rb index 2155e989c..bbb2af2d2 100644 --- a/lib/puppet/util/zaml.rb +++ b/lib/puppet/util/zaml.rb @@ -60,6 +60,7 @@ class ZAML def initialize(obj,indent) @indent = indent @this_label_number = nil + @obj = obj # prevent garbage collection so that object id isn't reused end def to_s @this_label_number ? ('&id%03d%s' % [@this_label_number, @indent]) : '' |