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.

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

Allow JSON 2.0 on Ruby 2.2 and above #144

Merged
merged 1 commit into from
Aug 26, 2016
Merged

Allow JSON 2.0 on Ruby 2.2 and above #144

merged 1 commit into from
Aug 26, 2016

Conversation

jkeiser
Copy link
Contributor

@jkeiser jkeiser commented Aug 24, 2016

No description provided.

@@ -8,6 +8,11 @@ if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('1.9.3')
gem 'net-ssh', '~> 2.9'
end

if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2')
gem 'json', '< 2.0'
gem 'rack', '< 2.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jkeiser we have a small type here

@chris-rock
Copy link
Contributor

Great addition @jkeiser Lets get this merged, once the syntax error is resolved

@jkeiser
Copy link
Contributor Author

jkeiser commented Aug 25, 2016

@chris-rock fixed! Awaiting appveyor/travis.

@chris-rock
Copy link
Contributor

We are going to address the docker timeout issues (not related to this improvement) in another PR.

@chris-rock chris-rock merged commit af715bd into master Aug 26, 2016
@chris-rock chris-rock deleted the jk/json2 branch August 26, 2016 08:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants