diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-09-09 17:38:47 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-09-09 17:38:47 +0530 |
| commit | cb524dc1d7525a26ecea8cf049757e530f0d4026 (patch) | |
| tree | 3a2d8727e97c67e37a357c1cf180e9ca17cff28b /activerecord/lib/active_record/connection_adapters/abstract | |
| parent | 6107407e66aa68cf269ec00b64d7ab3623465b97 (diff) | |
| parent | 2db79dc9ea0b623c6d76b72e85f58efd63b50e08 (diff) | |
| download | rails-cb524dc1d7525a26ecea8cf049757e530f0d4026.tar.gz rails-cb524dc1d7525a26ecea8cf049757e530f0d4026.tar.bz2 rails-cb524dc1d7525a26ecea8cf049757e530f0d4026.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 2 |
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 7a3d9bfd3e..bf08459b3b 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -494,7 +494,7 @@ module ActiveRecord # # Normally there is only a single ConnectionHandler instance, accessible via # ActiveRecord::Base.connection_handler. Active Record models use this to - # determine that connection pool that they should use. + # determine the connection pool that they should use. class ConnectionHandler def initialize @owner_to_pool = Hash.new { |h,k| h[k] = {} } |