From 254d4fd3358cb358109ee38f889e505746fc14f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Thu, 20 Sep 2012 20:11:07 +0200
Subject: [PATCH] bump heroku and fog

---
 Gemfile      |  4 ++--
 Gemfile.lock | 24 +++++++++++++-----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 90dbfa39c..9d26b1d6c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -65,7 +65,7 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
 # file uploading
 
 gem 'carrierwave', '0.6.2'
-gem 'fog', '1.4.0'
+gem 'fog', '1.6.0'
 gem 'mini_magick', '3.4'
 
 # JSON and API
@@ -170,7 +170,7 @@ group :test, :development do
 end
 
 group :development do
-  gem 'heroku', '2.28.12'
+  gem 'heroku', '2.31.4'
   gem 'heroku_san', '3.0.4'
   gem 'capistrano', '2.12.0', :require => false
   gem 'capistrano_colors', '0.5.5', :require => false
diff --git a/Gemfile.lock b/Gemfile.lock
index 830bfc415..bad4e9ffd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -146,7 +146,7 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.7.0)
     eventmachine (0.12.10)
-    excon (0.14.3)
+    excon (0.16.2)
     execjs (1.4.0)
       multi_json (~> 1.0)
     factory_girl (4.1.0)
@@ -163,9 +163,9 @@ GEM
     fixture_builder (0.3.4)
       activerecord (>= 2)
       activesupport (>= 2)
-    fog (1.4.0)
+    fog (1.6.0)
       builder
-      excon (~> 0.14.0)
+      excon (~> 0.14)
       formatador (~> 0.2.0)
       mime-types
       multi_json (~> 1.0)
@@ -204,14 +204,14 @@ GEM
       sprockets (>= 2.0.3)
       tilt
     hashie (1.2.0)
-    heroku (2.28.12)
-      heroku-api (~> 0.2.8)
+    heroku (2.31.4)
+      heroku-api (~> 0.3.5)
       launchy (>= 0.3.2)
-      netrc (~> 0.7.5)
+      netrc (~> 0.7.7)
       rest-client (~> 1.6.1)
       rubyzip
-    heroku-api (0.2.8)
-      excon (~> 0.14.3)
+    heroku-api (0.3.5)
+      excon (~> 0.16.1)
     heroku_san (3.0.4)
       activesupport
       heroku (>= 2)
@@ -243,6 +243,7 @@ GEM
     jquery-ui-rails (0.2.2)
       jquery-rails
       railties (>= 3.1.0)
+    jruby-pageant (1.1.1)
     json (1.7.5)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
@@ -274,7 +275,8 @@ GEM
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.5.2)
+    net-ssh (2.6.0)
+      jruby-pageant (>= 1.1.1)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     netrc (0.7.7)
@@ -474,7 +476,7 @@ DEPENDENCIES
   faraday_middleware (= 0.8.8)
   fastercsv (= 1.5.5)
   fixture_builder (= 0.3.4)
-  fog (= 1.4.0)
+  fog (= 1.6.0)
   foreigner (= 1.2.1)
   foreman (= 0.59)
   fuubar (= 1.0.0)
@@ -484,7 +486,7 @@ DEPENDENCIES
   guard-spork (= 0.8.0)
   haml (= 3.1.7)
   handlebars_assets (= 0.6.5)
-  heroku (= 2.28.12)
+  heroku (= 2.31.4)
   heroku_san (= 3.0.4)
   http_accept_language (= 1.0.2)
   i18n-inflector-rails (~> 1.0)