Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update aws-sdk requirement from ~> 2.3 to >= 2.3, < 4.0 #107

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Update aws-sdk requirement from ~> 2.3 to >= 2.3, < 4.0 #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
93b7e5c
Update aws-sdk requirement from ~> 2.3 to >= 2.3, < 4.0
dependabot-preview[bot] Jun 21, 2019
5051011
Merge branch 'master' into dependabot/bundler/aws-sdk-gte-2.3-and-lt-4.0
jspaleta Jan 16, 2020
eaedaf5
Merge branch 'master' into dependabot/bundler/aws-sdk-gte-2.3-and-lt-4.0
jspaleta Jan 18, 2020
b2c11fc
updated aws-sdk to latest minor release
jspaleta Jan 18, 2020
c1d61ee
Merge branch 'master' into dependabot/bundler/aws-sdk-gte-2.3-and-lt-4.0
jspaleta Jan 18, 2020
9373fd8
Merge branch 'master' into dependabot/bundler/aws-sdk-gte-2.3-and-lt-4.0
jspaleta Jan 18, 2020
bcd4c94
extend travis wait time for kitchen scripts
jspaleta Jan 18, 2020
90e2359
fix warning from kitchen, and extend kitchen wait further
jspaleta Jan 18, 2020
54ee3bb
extend kitchen wait further
jspaleta Jan 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ script:
- gem build sensu-plugins-http.gemspec
- gem install sensu-plugins-http-*.gem
- bundle exec rake quick
- bundle exec rake kitchen:ruby-`echo $TRAVIS_RUBY_VERSION | sed -e "s/\.//g"`-debian-8
- travis_wait 60 bundle exec rake kitchen:ruby-`echo $TRAVIS_RUBY_VERSION | sed -e "s/\.//g"`-debian-8
before_deploy:
- bash -c "[ ! -d bonsai/ ] && git clone https://github.com/sensu/sensu-go-bonsai-asset.git bonsai || echo 'bonsai/ exists, skipping git clone'; cp asset_build_scripts/Dockerfile.* bonsai/ruby-runtime/"
deploy:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins

### Breaking Change
- Updated json requirement from '< 2.0.0' to '~> 2.3'
- Updated aws-sdk requirement from '~> 2.3' to '~> 3.0'
- Updated oj requirement from '~> 2.18' to '~> 3.10'

### Fixed
- `check-http.rb`: An empty response body when using `-w` no longer creates a potentially confusing `no implicit conversion of nil into String` error

Expand Down
4 changes: 2 additions & 2 deletions sensu-plugins-http.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
s.test_files = s.files.grep(%r{^(test|spec|features)/})
s.version = SensuPluginsHttp::Version::VER_STRING

s.add_runtime_dependency 'aws-sdk', '~> 2.3'
s.add_runtime_dependency 'aws-sdk', '~> 3.0'
s.add_runtime_dependency 'oj', '~> 3.10'
s.add_runtime_dependency 'rest-client', '~> 2.1'
s.add_runtime_dependency 'sensu-plugin', '~> 4.0'
Expand All @@ -46,7 +46,7 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
s.add_development_dependency 'kitchen-vagrant', '~> 1.3'
s.add_development_dependency 'pry', '~> 0.10'
s.add_development_dependency 'rake', '~> 13.0'
s.add_development_dependency 'rdoc'
s.add_development_dependency 'rdoc', '~> 4.2'
s.add_development_dependency 'redcarpet', '~> 3.2'
s.add_development_dependency 'rspec', '~> 3.1'
s.add_development_dependency 'rubocop', '~> 0.79.0'
Expand Down