aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2013-12-20 00:10:30 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2013-12-20 00:10:30 +0530
commita3b1105ada3da64acfa3843b164b14b734456a50 (patch)
treeb3af8434bf411419bb0bc51aaac306ffe1451b95 /activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
parent3968870d31dc5ab272b5e77904c45183227696be (diff)
parent4dd8b0b5484289eaa30975dbd45bf7112f43a64a (diff)
downloadrails-a3b1105ada3da64acfa3843b164b14b734456a50.tar.gz
rails-a3b1105ada3da64acfa3843b164b14b734456a50.tar.bz2
rails-a3b1105ada3da64acfa3843b164b14b734456a50.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index cfdcae7f63..cebe741daa 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -86,7 +86,7 @@ module ActiveRecord
end
end
- # Return the number of threads currently waiting on this
+ # Returns the number of threads currently waiting on this
# queue.
def num_waiting
synchronize do