Skip to content

Commit

Permalink
Merge branch 'connection-pool-thread-fixes' of github.com:mjtko/rails…
Browse files Browse the repository at this point in the history 
… into connection-pool-thread-fixes

Conflicts:
	activerecord/lib/active_record/query_cache.rb
  • Loading branch information
@mjtko
mjtko committed Oct 7, 2011
2 parents 648eb48 + ab077d5 commit 4d530c3
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 4d530c3

Please sign in to comment.