diff options
| author | Luke Kanies <luke@madstop.com> | 2008-07-04 22:14:37 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-07-04 22:14:37 -0500 |
| commit | b0febd263c0cb8e61d512898f7c79868ea77e619 (patch) | |
| tree | 3f35c4b2d7186d3c69c070c9edc684ccdc51f658 /test/lib | |
| parent | df528a66cafc8538c3208bf0b52fdbe1065f6e48 (diff) | |
| parent | 81be1c5c3f85f514505e99fab5b8a2b2ae6fbec8 (diff) | |
| download | puppet-b0febd263c0cb8e61d512898f7c79868ea77e619.tar.gz puppet-b0febd263c0cb8e61d512898f7c79868ea77e619.tar.xz puppet-b0febd263c0cb8e61d512898f7c79868ea77e619.zip | |
Merge branch '0.24.x'
Conflicts:
lib/puppet/util/settings.rb
spec/integration/defaults.rb
spec/unit/node/catalog.rb
spec/unit/type/interface.rb
spec/unit/type/ssh_authorized_key.rb
Diffstat (limited to 'test/lib')
| -rw-r--r-- | test/lib/puppettest/support/utils.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/lib/puppettest/support/utils.rb b/test/lib/puppettest/support/utils.rb index b749c7931..0d775d184 100644 --- a/test/lib/puppettest/support/utils.rb +++ b/test/lib/puppettest/support/utils.rb @@ -82,7 +82,7 @@ module PuppetTest::Support::Utils newevents = nil assert_nothing_raised("Transaction %s %s failed" % [type, msg]) { newevents = trans.send(method).reject { |e| e.nil? }.collect { |e| - e.event + e.name } } |