diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-09-12 01:07:18 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-09-12 01:07:18 -0700 |
| commit | e85e7230196fd2a383ad19ddc035d79517020105 (patch) | |
| tree | 8d52e27c426da4312dc6915012d7bed200f3c672 | |
| parent | 34b23e7110a3a13cf157608cefc9b5701017bf39 (diff) | |
| parent | 84a52c6c7a0fb69c81a6add6d1201ea21024bf14 (diff) | |
| download | rails-e85e7230196fd2a383ad19ddc035d79517020105.tar.gz rails-e85e7230196fd2a383ad19ddc035d79517020105.tar.bz2 rails-e85e7230196fd2a383ad19ddc035d79517020105.zip | |
Merge pull request #7610 from arunagw/warning_removed_action_pack
warning removed.
| -rw-r--r-- | actionpack/test/fixtures/ruby_template.rb | 1 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/test/fixtures/ruby_template.rb b/actionpack/test/fixtures/ruby_template.rb index d99833a24d..5097bce47c 100644 --- a/actionpack/test/fixtures/ruby_template.rb +++ b/actionpack/test/fixtures/ruby_template.rb @@ -1,3 +1,2 @@ body = "" body << ["Hello", "from", "Ruby", "code"].join(" ") -body 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 d0ef20f1eb..f42a5df75f 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -424,7 +424,6 @@ module ActiveRecord elsif @connections.size < @size checkout_new_connection else - t0 = Time.now @available.poll(@checkout_timeout) end end |