Merge branch 'bump-fog-aws' into 'master'

Bump fog-aws and other dependent modules fog-aws CHANGELOG: https://github.com/fog/fog-aws/blob/master/CHANGELOG.md Notable improvements: * Support for ap-south-1 region * Fix for empty ETag values Closes #22260 See merge request !6392

Merge branch 'bump-fog-aws' into 'master'
6f035810 · Rémy Coutable · 9498c4d5 · 0f3afca3 · 6f035810 · 6f035810
Commit 6f035810 authored Sep 16, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

CHANGELOG CHANGELOG +1 -0

Gemfile.lock Gemfile.lock +4 -4

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.12.0 (unreleased)
  - Update the rouge gem to 2.0.6, which adds highlighting support for JSX, Prometheus, and others. !6251
  - Only check :can_resolve permission if the note is resolvable
+  - Bump fog-aws to v0.11.0 to support ap-south-1 region
  - Add ability to fork to a specific namespace using API. (ritave)
  - Cleanup misalignments in Issue list view !6206
  - Prune events older than 12 months. (ritave)

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -189,7 +189,7 @@ GEM
    erubis (2.7.0)
    escape_utils (1.1.1)
    eventmachine (1.0.8)
-    excon (0.49.0)
+    excon (0.52.0)
    execjs (2.6.0)
    expression_parser (0.9.0)
    factory_girl (4.5.0)
@@ -215,8 +215,8 @@ GEM
    flowdock (0.7.1)
      httparty (~> 0.7)
      multi_json
-    fog-aws (0.9.2)
-      fog-core (~> 1.27)
+    fog-aws (0.11.0)
+      fog-core (~> 1.38)
      fog-json (~> 1.0)
      fog-xml (~> 0.1)
      ipaddress (~> 0.8)
@@ -225,7 +225,7 @@ GEM
      fog-core (~> 1.27)
      fog-json (~> 1.0)
      fog-xml (~> 0.1)
-    fog-core (1.40.0)
+    fog-core (1.42.0)
      builder
      excon (~> 0.49)
      formatador (~> 0.2)