From e2f12c352f37312314de8a30eb748bb07ecc0e22 Mon Sep 17 00:00:00 2001 From: Marcin Ciunelis Date: Wed, 19 Oct 2011 16:02:38 +0200 Subject: [PATCH] rpm_contrib - mongo 1.4 compatible version added --- Gemfile | 3 +-- Gemfile.lock | 14 ++++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index df82f81..99c5338 100644 --- a/Gemfile +++ b/Gemfile @@ -18,8 +18,7 @@ gem 'inherited_resources' gem 'SystemTimer', :platform => :ruby_18 gem 'hoptoad_notifier', "~> 2.4" gem 'actionmailer_inline_css', "~> 1.3.0" -gem 'rpm_contrib' -gem 'newrelic_rpm' +gem 'rpm_contrib', :git => "git://github.com/bensymonds/rpm_contrib.git", :branch => "mongo-1.4.0_update" gem 'kaminari' platform :ruby do diff --git a/Gemfile.lock b/Gemfile.lock index ab2331c..1021734 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,12 @@ +GIT + remote: git://github.com/bensymonds/rpm_contrib.git + revision: 84ee78da6d0f154468d47c9e1e6597997e157291 + branch: mongo-1.4.0_update + specs: + rpm_contrib (2.1.6.beta1) + newrelic_rpm (>= 3.1.1) + newrelic_rpm (>= 3.1.1) + GEM remote: http://rubygems.org/ specs: @@ -159,8 +168,6 @@ GEM rest-client (1.6.7) mime-types (>= 1.16) ri_cal (0.8.8) - rpm_contrib (2.1.4) - newrelic_rpm (>= 3.1.1) rspec (2.6.0) rspec-core (~> 2.6.0) rspec-expectations (~> 2.6.0) @@ -232,14 +239,13 @@ DEPENDENCIES lighthouse-api mongoid (= 2.1.2) mongoid_rails_migrations - newrelic_rpm nokogiri octokit oruen_redmine_client pivotal-tracker rails (= 3.0.10) ri_cal - rpm_contrib + rpm_contrib! rspec (~> 2.6) rspec-rails (~> 2.6) ruby-debug -- libgit2 0.21.2