diff options
author | Tim Smith <tsmith@chef.io> | 2019-06-24 23:33:42 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-24 23:33:42 -0700 |
commit | ea5a46dc2ceb6459d81ac3ca3d10f8d805223ac1 (patch) | |
tree | 5e89de8f51d980cce9408e7b671a12000839955f | |
parent | 3f340d9ecbaaa610f62b21ea106b31d0ba162146 (diff) | |
parent | 159595cfa6a67f1f1819744de3c3e53fde0f0097 (diff) | |
download | chef-ea5a46dc2ceb6459d81ac3ca3d10f8d805223ac1.tar.gz |
Merge pull request #8690 from chef/ruby_prof
Pin to ruby-prof 0.17
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 5 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 2 |
3 files changed, 4 insertions, 5 deletions
@@ -45,7 +45,7 @@ end # Everything except AIX group(:ruby_prof) do - gem "ruby-prof" + gem "ruby-prof", "< 0.18" # 0.18 includes a x64-mingw32 gem, which doesn't load correctly. See https://github.com/ruby-prof/ruby-prof/issues/255 end # Everything except AIX and Windows diff --git a/Gemfile.lock b/Gemfile.lock index 0d651ab703..cd4864cbdb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -300,8 +300,7 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.4.0) - ruby-prof (0.18.0) - ruby-prof (0.18.0-x64-mingw32) + ruby-prof (0.17.0) ruby-progressbar (1.10.1) ruby-shadow (2.5.0) rubyntlm (0.6.2) @@ -436,7 +435,7 @@ DEPENDENCIES rspec-expectations (~> 3.5) rspec-mocks (~> 3.5) rspec_junit_formatter (~> 0.2.0) - ruby-prof + ruby-prof (< 0.18) ruby-shadow simplecov webmock diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 1bdb7e9d80..19242db542 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -32,7 +32,7 @@ GEM public_suffix (>= 2.0.2, < 4.0) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.177.0) + aws-partitions (1.178.0) aws-sdk-core (3.56.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1.0) |