mirror of
https://github.com/fog/fog-aws.git
synced 2022-11-09 13:50:52 -05:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
6e2da0a3af
3 changed files with 10 additions and 5 deletions
|
@ -10,7 +10,7 @@ matrix:
|
|||
- rvm: 1.8.7
|
||||
gemfile: gemfiles/Gemfile-ruby-1.8.7
|
||||
- rvm: 1.9.3
|
||||
gemfile: Gemfile
|
||||
gemfile: gemfiles/Gemfile-ruby-1.9
|
||||
- rvm: 2.0.0
|
||||
gemfile: Gemfile
|
||||
- rvm: 2.1.0
|
||||
|
@ -30,7 +30,7 @@ matrix:
|
|||
- rvm: jruby-18mode
|
||||
gemfile: gemfiles/Gemfile-ruby-1.8.7
|
||||
- rvm: jruby-19mode
|
||||
gemfile: Gemfile
|
||||
gemfile: gemfiles/Gemfile-ruby-1.9
|
||||
- rvm: jruby-head
|
||||
gemfile: Gemfile
|
||||
allow_failures:
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
# Change Log
|
||||
|
||||
## [Unreleased](https://github.com/fog/fog-aws/tree/HEAD)
|
||||
|
||||
[Full Changelog](https://github.com/fog/fog-aws/compare/v0.9.4...HEAD)
|
||||
## [v0.10.0](https://github.com/fog/fog-aws/tree/v0.10.0) (2016-07-15)
|
||||
[Full Changelog](https://github.com/fog/fog-aws/compare/v0.9.4...v0.10.0)
|
||||
|
||||
**Closed issues:**
|
||||
|
||||
|
|
6
gemfiles/Gemfile-ruby-1.9
Normal file
6
gemfiles/Gemfile-ruby-1.9
Normal file
|
@ -0,0 +1,6 @@
|
|||
source "https://rubygems.org"
|
||||
|
||||
gem 'json', '~> 1.8'
|
||||
gem 'mime-types', '~> 2.6', '>= 2.6.2'
|
||||
|
||||
gemspec :path => "../"
|
Loading…
Reference in a new issue