Skip to content
Browse files

Merge pull request #3424 from justindthomas/update-fog

update-gems [ci skip]
  • Loading branch information...
2 parents 20948d5 + 21f5e32 commit 28ad6accaaf5474368908fc1984adfcfeb0fe427 @maxwell maxwell committed Jun 28, 2012
Showing with 10 additions and 7 deletions.
  1. +10 −7 Gemfile.lock
View
17 Gemfile.lock
@@ -143,7 +143,7 @@ GEM
diff-lcs (1.1.3)
erubis (2.7.0)
eventmachine (0.12.10)
- excon (0.14.0)
+ excon (0.14.2)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (2.6.4)
@@ -160,14 +160,15 @@ GEM
fixture_builder (0.3.3)
activerecord (>= 2)
activesupport (>= 2)
- fog (0.7.2)
+ fog (1.4.0)
builder
- excon (>= 0.6.1)
- formatador (>= 0.1.3)
- json
+ excon (~> 0.14.0)
+ formatador (~> 0.2.0)
mime-types
+ multi_json (~> 1.0)
+ net-scp (~> 1.0.4)
net-ssh (>= 2.1.3)
- nokogiri (>= 1.4.4)
+ nokogiri (~> 1.5.0)
ruby-hmac
foreigner (1.1.6)
activerecord (>= 3.0.0)
@@ -255,7 +256,7 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
messagebus_ruby_api (1.0.3)
- mime-types (1.18)
+ mime-types (1.19)
mini_magick (3.4)
subexec (~> 0.2.1)
mobile-fu (1.1.0)
@@ -423,6 +424,7 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
+ sqlite3 (1.3.6)
subexec (0.2.2)
thin (1.3.1)
daemons (>= 1.0.9)
@@ -543,6 +545,7 @@ DEPENDENCIES
selenium-webdriver (~> 2.22.1)
settingslogic!
spork (~> 1.0rc2)
+ sqlite3
thin (~> 1.3.1)
timecop
twitter (= 2.0.2)

0 comments on commit 28ad6ac

Please sign in to comment.
Something went wrong with that request. Please try again.