diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-02 16:04:35 -0800 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-02 16:04:35 -0800 |
commit | ab63cd4be967b5d01f6ec856244e4b9af4e896d9 (patch) | |
tree | a802d2bfbce5fbc4016ba051cbf849b8937237ab | |
parent | b169e169f9af598ae9d4af5bfc5289b1255d93e7 (diff) | |
parent | ef0dcf4d524c75b402a235df0366e6e0848d0e10 (diff) | |
download | chef-ab63cd4be967b5d01f6ec856244e4b9af4e896d9.tar.gz |
Merge pull request #4517 from chef/lcg/add-pry
add pry, pry-byebug, pry-remote to omnibus-chef
-rw-r--r-- | chef.gemspec | 1 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 16 | ||||
-rw-r--r-- | omnibus/config/projects/chef.rb | 1 |
3 files changed, 9 insertions, 9 deletions
diff --git a/chef.gemspec b/chef.gemspec index dc58b84e9b..168279d99a 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -31,7 +31,6 @@ Gem::Specification.new do |s| s.add_dependency "diff-lcs", "~> 1.2", ">= 1.2.4" s.add_dependency "chef-zero", "~> 4.5" - s.add_dependency "pry", "~> 0.9" s.add_dependency "plist", "~> 3.1.0" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 426f9c7cbb..fde9c090aa 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: git://github.com/chef/omnibus-software.git - revision: df6193ea323343e6e472b8abd1b50aac3750b1e9 + revision: 4aefb7ae85b1ddc441ec93e012ca47adc81b2922 specs: omnibus-software (4.0.0) GIT remote: git://github.com/chef/omnibus.git - revision: 22a1715acc7f75eee96673820e52bf7b2f47e290 + revision: 47eeebd10c056168102ae4a1068dfabd05098b63 specs: omnibus (5.0.0) aws-sdk (~> 2) @@ -22,12 +22,12 @@ GEM remote: https://rubygems.org/ specs: addressable (2.3.8) - aws-sdk (2.2.13) - aws-sdk-resources (= 2.2.13) - aws-sdk-core (2.2.13) + aws-sdk (2.2.14) + aws-sdk-resources (= 2.2.14) + aws-sdk-core (2.2.14) jmespath (~> 1.0) - aws-sdk-resources (2.2.13) - aws-sdk-core (= 2.2.13) + aws-sdk-resources (2.2.14) + aws-sdk-core (= 2.2.14) berkshelf (3.2.4) addressable (~> 2.3.4) berkshelf-api-client (~> 1.2) @@ -115,7 +115,7 @@ GEM nori (2.6.0) octokit (3.8.0) sawyer (~> 0.6.0, >= 0.5.3) - ohai (8.8.1) + ohai (8.9.0) chef-config (>= 12.5.0.alpha.1, < 13) ffi (~> 1.9) ffi-yajl (~> 2.2) diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb index 28f69306cb..4242e0fef0 100644 --- a/omnibus/config/projects/chef.rb +++ b/omnibus/config/projects/chef.rb @@ -62,6 +62,7 @@ override :ohai, version: "master" dependency "preparation" dependency "chef" +dependency "pry" dependency "nokogiri" dependency "shebang-cleanup" dependency "version-manifest" |