From 4fa8cc4e62f1c1ba5ff9ed0fb1e8bb5c89fa6d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:41:50 +0200 Subject: [PATCH] bump fog --- Gemfile | 2 +- Gemfile.lock | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index c74c88259..c41866fa1 100644 --- a/Gemfile +++ b/Gemfile @@ -70,7 +70,7 @@ gem "activerecord-import", "0.10.0" # File uploading gem "carrierwave", "0.10.0" -gem "fog", "1.32.0" +gem "fog", "1.34.0" gem "mini_magick", "4.2.7" gem "remotipart", "1.2.1" diff --git a/Gemfile.lock b/Gemfile.lock index bd7991845..1eda2280c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -210,12 +210,13 @@ GEM fixture_builder (0.4.1) activerecord (>= 2) activesupport (>= 2) - fog (1.32.0) + fog (1.34.0) fog-atmos fog-aws (>= 0.6.0) fog-brightbox (~> 0.4) fog-core (~> 1.32) - fog-ecloud (= 0.1.1) + fog-dynect (~> 0.0.2) + fog-ecloud (~> 0.1) fog-google (>= 0.0.2) fog-json fog-local @@ -236,23 +237,27 @@ GEM fog-atmos (0.1.0) fog-core fog-xml - fog-aws (0.7.3) + fog-aws (0.7.6) fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-brightbox (0.8.0) + fog-brightbox (0.9.0) fog-core (~> 1.22) fog-json inflecto (~> 0.0.2) - fog-core (1.32.0) + fog-core (1.32.1) builder excon (~> 0.45) formatador (~> 0.2) mime-types net-scp (~> 1.1) net-ssh (>= 2.1.3) - fog-ecloud (0.1.1) + fog-dynect (0.0.2) + fog-core + fog-json + fog-xml + fog-ecloud (0.3.0) fog-core fog-xml fog-google (0.0.7) @@ -280,7 +285,7 @@ GEM fog-core fog-json fog-xml - fog-sakuracloud (1.0.1) + fog-sakuracloud (1.1.1) fog-core fog-json fog-serverlove (0.1.2) @@ -775,7 +780,7 @@ DEPENDENCIES faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.10.0) fixture_builder (= 0.4.1) - fog (= 1.32.0) + fog (= 1.34.0) fuubar (= 2.0.0) gon (= 6.0.1) guard (= 2.13.0)