diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-10-04 12:22:44 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-10-04 12:22:47 -0700 |
| commit | 1a00c07971c4297bce1b3e0edee3b6b3399e17bb (patch) | |
| tree | 0a8b1f1be1eddcb31e1b0ff7d69dbb60bd1c7e81 /lib/puppet/rails.rb | |
| parent | d43f7996b93c394df0bd0994ae7298fb35ad2c5e (diff) | |
| parent | 66cf3a925b4b6d9b40cbdf95f2be6575bb05a881 (diff) | |
| download | puppet-1a00c07971c4297bce1b3e0edee3b6b3399e17bb.tar.gz puppet-1a00c07971c4297bce1b3e0edee3b6b3399e17bb.tar.xz puppet-1a00c07971c4297bce1b3e0edee3b6b3399e17bb.zip | |
Partial merge to 2.6.2rc1 : Merge commit '66cf3a9' into next
There are test failures in commits following this one.
Diffstat (limited to 'lib/puppet/rails.rb')
| -rw-r--r-- | lib/puppet/rails.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb index 414b1bc18..c2d492fdd 100644 --- a/lib/puppet/rails.rb +++ b/lib/puppet/rails.rb @@ -2,6 +2,7 @@ require 'facter' require 'puppet' +require 'logger' module Puppet::Rails TIME_DEBUG = true @@ -22,9 +23,8 @@ module Puppet::Rails ActiveRecord::Base.logger.level = Logger::DEBUG end - if (::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR <= 1) - ActiveRecord::Base.allow_concurrency = true - end + # As of ActiveRecord 2.2 allow_concurrency has been deprecated and no longer has any effect. + ActiveRecord::Base.allow_concurrency = true if Puppet::Util.activerecord_version < 2.2 ActiveRecord::Base.verify_active_connections! |