summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-01-20 08:26:04 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2016-01-20 08:26:04 -0800
commitd07d0ae3a23feda7b6e6bb371ea03a8817f7a9b6 (patch)
tree290933eaa6af9b2e6be5a0cb2bab14a23c56b86a
parent25b2c0559caaf29872d6cfe3ab146cb63c496d00 (diff)
parent275d4c4c936b3bb47163ab79ca1b15b82fa3367e (diff)
downloadchef-d07d0ae3a23feda7b6e6bb371ea03a8817f7a9b6.tar.gz
Merge pull request #4435 from chef/lcg/chef-addons
add nokogiri to omnibus-chef
-rw-r--r--omnibus/Gemfile.lock2
-rw-r--r--omnibus/config/projects/chef.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 19c32fbccb..93b0a2016b 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/chef/omnibus-software.git
- revision: 1baba87d3fca8de9fbba0fb5971e116c6eee519e
+ revision: e9675680662c8420b980d2d6067a93212d898f67
specs:
omnibus-software (4.0.0)
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index a615069c9d..1c9d647f16 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -59,6 +59,7 @@ override :ohai, version: "master"
dependency "preparation"
dependency "chef"
+dependency "nokogiri"
dependency "shebang-cleanup"
dependency "version-manifest"
dependency "openssl-customization"