Merge pull request #887 from warpc/883-update-newrelic

[refs #883]: update "newrelic_rpm" gem
This commit is contained in:
Vladimir Sharshov 2013-02-04 08:02:49 -08:00
commit 4b1d780f26
2 changed files with 10 additions and 16 deletions

View File

@ -41,7 +41,7 @@ gem 'wikicloth'
gem 'unicorn', '~> 4.3.1', :platforms => [:mri, :rbx] gem 'unicorn', '~> 4.3.1', :platforms => [:mri, :rbx]
gem 'trinidad', '~> 1.0.2', :platforms => :jruby gem 'trinidad', '~> 1.0.2', :platforms => :jruby
gem 'newrelic_rpm', '~> 3.4.1', :platforms => [:mri, :rbx] gem 'newrelic_rpm', '~> 3.5.5.38', :platforms => [:mri, :rbx]
gem 'whenever', '~> 0.7.3', :require => false gem 'whenever', '~> 0.7.3', :require => false
gem 'jbuilder', '~> 0.8.2' gem 'jbuilder', '~> 0.8.2'

View File

@ -52,9 +52,10 @@ GEM
activesupport (3.2.11) activesupport (3.2.11)
i18n (~> 0.6) i18n (~> 0.6)
multi_json (~> 1.0) multi_json (~> 1.0)
airbrake (3.1.6) airbrake (3.1.7)
activesupport
builder builder
girl_friday json
ancestry (1.3.0) ancestry (1.3.0)
activerecord (>= 2.3.14) activerecord (>= 2.3.14)
arel (3.0.2) arel (3.0.2)
@ -96,7 +97,6 @@ GEM
sass (~> 3.1) sass (~> 3.1)
compass-rails (1.0.3) compass-rails (1.0.3)
compass (>= 0.12.2, < 0.14) compass (>= 0.12.2, < 0.14)
connection_pool (1.0.0)
creole (0.5.0) creole (0.5.0)
daemons (1.1.6) daemons (1.1.6)
devise (2.1.3) devise (2.1.3)
@ -121,9 +121,6 @@ GEM
railties (>= 3.0.0) railties (>= 3.0.0)
ffi (1.0.11) ffi (1.0.11)
fssm (0.2.10) fssm (0.2.10)
girl_friday (0.11.2)
connection_pool (~> 1.0)
rubinius-actor
github-linguist (2.2.1) github-linguist (2.2.1)
charlock_holmes (~> 0.6.6) charlock_holmes (~> 0.6.6)
escape_utils (~> 0.2.3) escape_utils (~> 0.2.3)
@ -181,7 +178,7 @@ GEM
meta-tags (1.2.6) meta-tags (1.2.6)
actionpack actionpack
metaclass (0.0.1) metaclass (0.0.1)
mime-types (1.19) mime-types (1.20.1)
mocha (0.10.5) mocha (0.10.5)
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
mock_redis (0.6.2) mock_redis (0.6.2)
@ -194,7 +191,7 @@ GEM
net-ssh (2.6.3) net-ssh (2.6.3)
net-ssh-gateway (1.1.0) net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
newrelic_rpm (3.4.2.1) newrelic_rpm (3.5.5.38)
nokogiri (1.5.6) nokogiri (1.5.6)
omniauth (1.1.1) omniauth (1.1.1)
hashie (~> 1.2) hashie (~> 1.2)
@ -226,7 +223,7 @@ GEM
ruby-openid (>= 2.1.8) ruby-openid (>= 2.1.8)
rack-protection (1.3.2) rack-protection (1.3.2)
rack rack
rack-ssl (1.3.2) rack-ssl (1.3.3)
rack rack
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
@ -257,7 +254,7 @@ GEM
thor (>= 0.14.6, < 2.0) thor (>= 0.14.6, < 2.0)
raindrops (0.10.0) raindrops (0.10.0)
rake (10.0.3) rake (10.0.3)
rdiscount (1.6.8) rdiscount (2.0.7)
rdoc (3.12) rdoc (3.12)
json (~> 1.4) json (~> 1.4)
redcarpet (2.1.1) redcarpet (2.1.1)
@ -294,9 +291,6 @@ GEM
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 3.0) railties (>= 3.0)
rspec (~> 2.11.0) rspec (~> 2.11.0)
rubinius-actor (0.0.2)
rubinius-core-api
rubinius-core-api (0.0.1)
ruby-haml-js (0.0.3) ruby-haml-js (0.0.3)
execjs execjs
sprockets (>= 2.0.0) sprockets (>= 2.0.0)
@ -363,7 +357,7 @@ GEM
rack rack
raindrops (~> 0.7) raindrops (~> 0.7)
useragent (0.4.16) useragent (0.4.16)
uuid (2.3.6) uuid (2.3.5)
macaddr (~> 1.0) macaddr (~> 1.0)
vegas (0.1.11) vegas (0.1.11)
rack (>= 1.0.0) rack (>= 1.0.0)
@ -409,7 +403,7 @@ DEPENDENCIES
mailcatcher mailcatcher
meta-tags (~> 1.2.5) meta-tags (~> 1.2.5)
mock_redis (= 0.6.2) mock_redis (= 0.6.2)
newrelic_rpm (~> 3.4.1) newrelic_rpm (~> 3.5.5.38)
omniauth (~> 1.1.0) omniauth (~> 1.1.0)
omniauth-openid (~> 1.0.1) omniauth-openid (~> 1.0.1)
paperclip (~> 3.3.1) paperclip (~> 3.3.1)