diff options
author | Xavier Noria <fxn@hashref.com> | 2011-05-01 11:16:31 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-05-01 11:16:31 +0200 |
commit | 2fbf302149cf40c791ca1207a5f984cf58903397 (patch) | |
tree | 5da770d0fd31520a6264a9864b1db1412646d100 /activesupport/lib/active_support/notifications | |
parent | a0656989c47c29c87c4f243ce3695c39777c67b8 (diff) | |
parent | b84b759ec60b5005fea183186639408fcf903450 (diff) | |
download | rails-2fbf302149cf40c791ca1207a5f984cf58903397.tar.gz rails-2fbf302149cf40c791ca1207a5f984cf58903397.tar.bz2 rails-2fbf302149cf40c791ca1207a5f984cf58903397.zip |
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
railties/guides/source/contributing_to_ruby_on_rails.textile
Diffstat (limited to 'activesupport/lib/active_support/notifications')
-rw-r--r-- | activesupport/lib/active_support/notifications/fanout.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/notifications/fanout.rb b/activesupport/lib/active_support/notifications/fanout.rb index adc34f3286..a9aa5464e9 100644 --- a/activesupport/lib/active_support/notifications/fanout.rb +++ b/activesupport/lib/active_support/notifications/fanout.rb @@ -1,7 +1,7 @@ module ActiveSupport module Notifications - # This is a default queue implementation that ships with Notifications. It - # just pushes events to all registered log subscribers. + # This is a default queue implementation that ships with Notifications. + # It just pushes events to all registered log subscribers. class Fanout def initialize @subscribers = [] @@ -33,7 +33,7 @@ module ActiveSupport listeners_for(name).any? end - # This is a sync queue, so there is not waiting. + # This is a sync queue, so there is no waiting. def wait end |