diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2014-04-18 21:59:44 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2014-04-18 21:59:44 +0530 |
| commit | c2fa85f48124fe69a420139360d1369016296e62 (patch) | |
| tree | 12d33a7e60694eb2a054ff292d852b3e529e95f1 /activerecord/lib | |
| parent | 2ff138be2c9b315d3f07ed82c91f179b62531783 (diff) | |
| parent | e50719332e691c97aaae8d3103407d6db2a789ee (diff) | |
| download | rails-c2fa85f48124fe69a420139360d1369016296e62.tar.gz rails-c2fa85f48124fe69a420139360d1369016296e62.tar.bz2 rails-c2fa85f48124fe69a420139360d1369016296e62.zip | |
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/connection_specification.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/connection_specification.rb index a8ab52be74..b79d1a4458 100644 --- a/activerecord/lib/active_record/connection_adapters/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb @@ -62,8 +62,8 @@ module ActiveRecord # Converts the query parameters of the URI into a hash. # - # "localhost?pool=5&reap_frequency=2" - # # => { "pool" => "5", "reap_frequency" => "2" } + # "localhost?pool=5&reaping_frequency=2" + # # => { "pool" => "5", "reaping_frequency" => "2" } # # returns empty hash if no query present. # |