Merge branch 'master' into remove_skydrive

samvera · Sep 25, 2017 · 632014e · 632014e
2 parents a60a93b + e85625d
commit 632014e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/browse-everything.gemspec b/browse-everything.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'google-api-client', '~> 0.9'
   spec.add_dependency 'signet'
   spec.add_dependency 'httparty'
-  spec.add_dependency 'aws-sdk'
+  spec.add_dependency 'aws-sdk-s3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'rspec-its'

diff --git a/lib/browse_everything/driver/s3.rb b/lib/browse_everything/driver/s3.rb
@@ -1,4 +1,4 @@
-require 'aws-sdk'
+require 'aws-sdk-s3'
 
 module BrowseEverything
   module Driver