summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet.rb2
-rw-r--r--lib/puppet/util/zaml.rb1
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]) : ''