diff options
author | Matt Wrock <matt@mattwrock.com> | 2016-09-01 12:34:33 -0700 |
---|---|---|
committer | Matt Wrock <matt@mattwrock.com> | 2016-09-01 12:34:33 -0700 |
commit | 7621890402e395b05cb64466abc232e701123d3b (patch) | |
tree | 149d74120d196d2022a5d3804df88b47a91dce78 | |
parent | ec7d08c0352cad1d99e6d57556195832ce3b9e99 (diff) | |
download | chef-7621890402e395b05cb64466abc232e701123d3b.tar.gz |
pinning berkshelfacceptance_bump
-rw-r--r-- | acceptance/Gemfile | 2 | ||||
-rw-r--r-- | acceptance/Gemfile.lock | 62 |
2 files changed, 33 insertions, 31 deletions
diff --git a/acceptance/Gemfile b/acceptance/Gemfile index 48a668e6bc..1cd1d990eb 100644 --- a/acceptance/Gemfile +++ b/acceptance/Gemfile @@ -11,4 +11,4 @@ gem "kitchen-inspec", :github => "mwrock/kitchen-inspec", :branch => "winrm-v2" gem "test-kitchen", :github => "test-kitchen", :branch => "winrm-v2" gem "train", :github => "chef/train", :branch => "winrm-v2" gem "winrm-elevated" -gem "berkshelf" +gem "berkshelf", "4.3.5" diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock index 49959d244b..c62d98c020 100644 --- a/acceptance/Gemfile.lock +++ b/acceptance/Gemfile.lock @@ -54,12 +54,14 @@ GEM jmespath (~> 1.0) aws-sdk-resources (2.5.7) aws-sdk-core (= 2.5.7) - berkshelf (5.0.0) + berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) - berkshelf-api-client (>= 2.0.2, < 4.0) - buff-config (~> 2.0) - buff-extensions (~> 2.0) + berkshelf-api-client (~> 2.0, >= 2.0.2) + buff-config (~> 1.0) + buff-extensions (~> 1.0) buff-shell_out (~> 0.1) + celluloid (= 0.16.0) + celluloid-io (~> 0.16.1) cleanroom (~> 1.0) faraday (~> 0.9) httpclient (~> 2.7) @@ -67,18 +69,18 @@ GEM mixlib-archive (~> 0.1) octokit (~> 4.0) retryable (~> 2.0) - ridley (~> 5.0) - solve (> 2.0, < 4.0) + ridley (~> 4.5) + solve (~> 2.0) thor (~> 0.19) - berkshelf-api-client (3.0.0) - faraday (~> 0.9) - httpclient (~> 2.7) - ridley (>= 4.5, < 6.0) - buff-config (2.0.0) - buff-extensions (~> 2.0) - varia_model (~> 0.6) - buff-extensions (2.0.0) - buff-ignore (1.2.0) + berkshelf-api-client (2.0.2) + faraday (~> 0.9.1) + httpclient (~> 2.7.0) + ridley (~> 4.5) + buff-config (1.0.1) + buff-extensions (~> 1.0) + varia_model (~> 0.4) + buff-extensions (1.0.0) + buff-ignore (1.1.1) buff-ruby_engine (0.1.0) buff-shell_out (0.2.0) buff-ruby_engine (~> 0.1.0) @@ -110,7 +112,7 @@ GEM builder (>= 2.1.2) hashie (3.4.4) hitimes (1.2.4) - httpclient (2.8.2.3) + httpclient (2.7.2) inspec (0.28.1) hashie (~> 3.4) json (~> 1.8) @@ -150,7 +152,7 @@ GEM mixlib-log (1.7.1) mixlib-shellout (2.2.7) mixlib-versioning (1.1.0) - molinillo (0.5.0) + molinillo (0.4.5) multi_json (1.12.1) multipart-post (2.0.0) net-scp (1.2.1) @@ -168,11 +170,11 @@ GEM slop (~> 3.4) rainbow (2.1.0) retryable (2.0.4) - ridley (5.0.0) + ridley (4.6.1) addressable - buff-config (~> 2.0) - buff-extensions (~> 2.0) - buff-ignore (~> 1.2) + buff-config (~> 1.0) + buff-extensions (~> 1.0) + buff-ignore (~> 1.1.1) buff-shell_out (~> 0.1) celluloid (~> 0.16.0) celluloid-io (~> 0.16.1) @@ -184,8 +186,8 @@ GEM json (>= 1.7.7) mixlib-authentication (>= 1.3.0) retryable (~> 2.0) - semverse (~> 2.0) - varia_model (~> 0.6) + semverse (~> 1.1) + varia_model (~> 0.4.0) rspec (3.5.0) rspec-core (~> 3.5.0) rspec-expectations (~> 3.5.0) @@ -208,16 +210,16 @@ GEM sawyer (0.7.0) addressable (>= 2.3.5, < 2.5) faraday (~> 0.8, < 0.10) - semverse (2.0.0) + semverse (1.2.1) slop (3.6.0) - solve (3.0.1) - molinillo (~> 0.4) - semverse (>= 1.1, < 3.0) + solve (2.0.3) + molinillo (~> 0.4.2) + semverse (~> 1.1) thor (0.19.1) timers (4.0.4) hitimes - varia_model (0.6.0) - buff-extensions (~> 2.0) + varia_model (0.4.1) + buff-extensions (~> 1.0) hashie (>= 2.0.2, < 4.0.0) windows_chef_zero (2.0.0) test-kitchen (>= 1.2.1) @@ -243,7 +245,7 @@ PLATFORMS ruby DEPENDENCIES - berkshelf + berkshelf (= 4.3.5) chef-acceptance! inspec kitchen-ec2 |