Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

Commit

Permalink
Merge pull request #102 from opscode/lcg/install-ohai-after
Browse files Browse the repository at this point in the history 
move ohai install after chef install
  • Loading branch information
@lamont-granquist
lamont-granquist committed Oct 21, 2013
2 parents b8d09f5 + 8c5ce20 commit d8e2536
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ GIT

GIT
remote: git://github.com/opscode/omnibus-software.git
revision: db589575f14bc921d089d23da1becdaba211d50b
revision: 12bad1aebf5f475ce0b9b5634fa701a9bc91620f
branch: master
specs:
omnibus-software (0.0.1)
Expand Down
1 change: 1 addition & 0 deletions config/projects/chef-windows.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@
dependency "ruby-windows"
dependency "ruby-windows-devkit"
dependency "chef-windows"
dependency "ohai" if ENV["OHAI_GIT_REV"]
dependency "chef-client-msi"
1 change: 1 addition & 0 deletions config/projects/chef.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@

dependency "preparation"
dependency "chef"
dependency "ohai" if ENV["OHAI_GIT_REV"]
dependency "version-manifest"
1 change: 0 additions & 1 deletion config/software/chef-windows.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
dependency "ruby-windows-devkit"
dependency "bundler"
dependency "cacerts"
dependency "ohai" if ENV["OHAI_GIT_REV"]

version ENV['CHEF_GIT_REV'] || "master"

Expand Down

0 comments on commit d8e2536

Please sign in to comment.