Permalink
Browse files

Merge branch 'master' of github.com:newscloud/n2

  • Loading branch information...
2 parents ffab914 + 6f17566 commit d64ea41a99b69b11dcca1545fae1a58da8b712ea @newscloud committed Jan 12, 2012
Showing with 5 additions and 3 deletions.
  1. +1 −1 Gemfile
  2. +2 −2 Gemfile.lock
  3. +2 −0 config/initializers/resque_connection_fix.rb
View
@@ -17,7 +17,7 @@ gem 'will_paginate', '~> 2.3.11'
gem "tzinfo", '0.3.23'
gem "oauth"
gem "twitter"
-gem "mysql"
+gem "mysql2", "< 0.3"
gem "bitly"
gem "redis"
gem "redis-namespace"
View
@@ -147,7 +147,7 @@ GEM
multi_json (1.0.3)
multi_xml (0.2.2)
multipart-post (1.1.0)
- mysql (2.8.1)
+ mysql2 (0.2.18)
net-ldap (0.2.2)
net-scp (1.0.2)
net-ssh (>= 1.99.1)
@@ -315,7 +315,7 @@ DEPENDENCIES
launchy
loofah (= 0.4.7)
mogli
- mysql
+ mysql2 (< 0.3)
newrelic_rpm
nokogiri
oauth
@@ -11,6 +11,7 @@
# From:
# http://coderrr.wordpress.com/2009/01/08/activerecord-threading-issues-and-resolutions/
+=begin
module ActiveRecord::ConnectionAdapters
class MysqlAdapter
alias_method :execute_without_retry, :execute
@@ -28,3 +29,4 @@ def execute(*args)
end
end
end
+=end

0 comments on commit d64ea41

Please sign in to comment.