diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2011-02-01 16:55:40 -0800 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2011-02-01 16:55:40 -0800 |
| commit | 9b064e655f90bb5aa2f95e343e9c22765ddf4998 (patch) | |
| tree | c8a3efdc98f4035104e6d542a1821f0464590185 | |
| parent | 9a7a39b3f9302b912e15fd77b4e18662e83089e4 (diff) | |
| parent | ae48634cec08bbb590110a38e4538a984186f1b7 (diff) | |
| download | puppet-9b064e655f90bb5aa2f95e343e9c22765ddf4998.tar.gz | |
Merge remote branch 'james/tickets/2.6.x/5914' into 2.6.next
| -rw-r--r-- | lib/puppet/util/settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb index ca4ecda35..626ed20eb 100644 --- a/lib/puppet/util/settings.rb +++ b/lib/puppet/util/settings.rb @@ -593,7 +593,7 @@ if @config.include?(:run_mode) end eachsection do |section| persection(section) do |obj| - str += obj.to_config + "\n" unless ReadOnly.include? obj.name + str += obj.to_config + "\n" unless ReadOnly.include? obj.name or obj.name == :genconfig end end |