diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-01-05 17:22:30 -0800 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-01-06 15:19:42 -0800 |
| commit | b16e10dba6606b808ef195f4b57f2e8c66cf65ab (patch) | |
| tree | bdacf054c1e877166217336322050ee03f28d607 /lib/puppet/util/log_paths.rb | |
| parent | fb8509acbd947712cac094a49227d28a16a366aa (diff) | |
| parent | 19eb1e78e115d10bfb822e510213e4fab9cd2599 (diff) | |
| download | puppet-b16e10dba6606b808ef195f4b57f2e8c66cf65ab.tar.gz puppet-b16e10dba6606b808ef195f4b57f2e8c66cf65ab.tar.xz puppet-b16e10dba6606b808ef195f4b57f2e8c66cf65ab.zip | |
Merge branch '2.6.x' into next
Conflicts:
Rakefile
lib/puppet/resource/type_collection.rb
lib/puppet/simple_graph.rb
lib/puppet/transaction.rb
lib/puppet/transaction/report.rb
lib/puppet/util/metric.rb
spec/integration/indirector/report/rest_spec.rb
spec/spec_specs/runnable_spec.rb
spec/unit/configurer_spec.rb
spec/unit/indirector_spec.rb
spec/unit/transaction/change_spec.rb
Diffstat (limited to 'lib/puppet/util/log_paths.rb')
| -rw-r--r-- | lib/puppet/util/log_paths.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/log_paths.rb b/lib/puppet/util/log_paths.rb index f59197ed1..2fefd4505 100644 --- a/lib/puppet/util/log_paths.rb +++ b/lib/puppet/util/log_paths.rb @@ -15,7 +15,7 @@ module Puppet::Util::LogPaths descriptors[:tags] = tags - [:path, :file, :line, :version].each do |param| + [:path, :file, :line].each do |param| next unless value = send(param) descriptors[param] = value end |