Skip to content

Commit

Permalink
Pin json to help fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
solarkennedy committed Jul 27, 2016
1 parent 89056ca commit 17a4b6d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
source "https://rubygems.org"

group :development do
gem "json", '~> 1.8.3'
gem "beaker", "> 2.0.0"
gem "beaker-rspec", ">= 5.1.0"
gem "beaker-puppet_install_helper"
Expand All @@ -11,7 +12,7 @@ group :development do
end

group :test do
gem "json"
gem "json", '~> 1.8.3'
# Pin for 1.8.7 compatibility for now
gem "rake", '< 11.0.0'
gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.7.0'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ DEPENDENCIES
beaker-rspec (>= 5.1.0)
hiera
hiera-puppet-helper
json
json (~> 1.8.3)
pry
puppet (~> 3.7.0)
puppet-blacksmith
Expand All @@ -317,4 +317,4 @@ DEPENDENCIES
vagrant-wrapper

BUNDLED WITH
1.10.6
1.11.2

0 comments on commit 17a4b6d

Please sign in to comment.