Commit 3506e925 authored by Jonne Haß's avatar Jonne Haß Committed by Dennis Schubert
Browse files

bump fog

parent 41ef7020

Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ gem "activerecord-import", "0.10.0" 
# File uploading



gem "carrierwave", "0.10.0"

gem "fog",         "1.31.0"

gem "fog",         "1.32.0"

gem "mini_magick", "4.2.7"

gem "remotipart",  "1.2.1"

Gemfile.lock

+13 −13
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ GEM 
    ethon (0.7.4)

      ffi (>= 1.3.0)

    eventmachine (1.0.7)

    excon (0.45.3)

    excon (0.45.4)

    execjs (2.5.2)

    eye (0.7.pre)

      celluloid (~> 0.16.0)
@@ -207,12 +207,12 @@ GEM 
    fixture_builder (0.4.1)

      activerecord (>= 2)

      activesupport (>= 2)

    fog (1.31.0)

    fog (1.32.0)

      fog-atmos

      fog-aws (~> 0.0)

      fog-aws (>= 0.6.0)

      fog-brightbox (~> 0.4)

      fog-core (~> 1.30)

      fog-ecloud

      fog-core (~> 1.32)

      fog-ecloud (= 0.1.1)

      fog-google (>= 0.0.2)

      fog-json

      fog-local
@@ -233,26 +233,26 @@ GEM 
    fog-atmos (0.1.0)

      fog-core

      fog-xml

    fog-aws (0.5.0)

    fog-aws (0.7.3)

      fog-core (~> 1.27)

      fog-json (~> 1.0)

      fog-xml (~> 0.1)

      ipaddress (~> 0.8)

    fog-brightbox (0.7.1)

    fog-brightbox (0.8.0)

      fog-core (~> 1.22)

      fog-json

      inflecto (~> 0.0.2)

    fog-core (1.31.1)

    fog-core (1.32.0)

      builder

      excon (~> 0.45)

      formatador (~> 0.2)

      mime-types

      net-scp (~> 1.1)

      net-ssh (>= 2.1.3)

    fog-ecloud (0.1.3)

    fog-ecloud (0.1.1)

      fog-core

      fog-xml

    fog-google (0.0.5)

    fog-google (0.0.7)

      fog-core

      fog-json

      fog-xml
@@ -265,7 +265,7 @@ GEM 
      fog-core (~> 1.27)

      fog-json (~> 1.0)

      fog-xml (~> 0.1)

    fog-profitbricks (0.0.3)

    fog-profitbricks (0.0.5)

      fog-core

      fog-xml

      nokogiri
@@ -283,7 +283,7 @@ GEM 
    fog-serverlove (0.1.2)

      fog-core

      fog-json

    fog-softlayer (0.4.6)

    fog-softlayer (0.4.7)

      fog-core

      fog-json

    fog-storm_on_demand (0.1.1)
@@ -773,7 +773,7 @@ DEPENDENCIES 
  faraday-cookie_jar (= 0.0.6)

  faraday_middleware (= 0.10.0)

  fixture_builder (= 0.4.1)

  fog (= 1.31.0)

  fog (= 1.32.0)

  fuubar (= 2.0.0)

  gon (= 5.2.3)

  guard (= 2.12.5)