summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsersut <serdar@opscode.com>2014-05-30 12:47:52 -0700
committersersut <serdar@opscode.com>2014-05-30 13:06:15 -0700
commit1642afe8aaaaf351e93123d86ffbe0c09dd3736a (patch)
tree7a9bbbbbd8c29e0e1afa2d98244e9a773f266432
parent02419468222668cc1dd414470416f396d5db46eb (diff)
downloadchef-1642afe8aaaaf351e93123d86ffbe0c09dd3736a.tar.gz
Pin release versions of ohai and wmi-lite for Ruby 2.0 windows compatibility.
-rw-r--r--CHANGELOG.md1
-rw-r--r--chef-x86-mingw32.gemspec2
-rw-r--r--chef.gemspec2
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4edd543ed..4b25a72b10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
* knife now bootstraps node with the latest current version of chef-client. (CHEF-4911)
* Add config options for attribute whitelisting in node.save. (CHEF-3811)
* Use user's .chef as a fallback cache path if /var/chef is not accessible. (CHEF-5259)
+* Fixed Ruby 2.0 Windows compatibility issues around ruby-wmi gem by replacing it with wmi-lite gem.
## Release: 11.12.4 (04/30/2014)
http://www.getchef.com/blog/2014/04/30/release-chef-client-11-12-4-ohai-7-0-4/
diff --git a/chef-x86-mingw32.gemspec b/chef-x86-mingw32.gemspec
index 2a1a2f7f9a..e34724ae51 100644
--- a/chef-x86-mingw32.gemspec
+++ b/chef-x86-mingw32.gemspec
@@ -13,6 +13,6 @@ gemspec.add_dependency "win32-mutex", "0.4.1"
gemspec.add_dependency "win32-process", "0.7.3"
gemspec.add_dependency "win32-service", "0.8.2"
gemspec.add_dependency "win32-mmap", "0.4.0"
-gemspec.add_dependency "wmi-lite", "1.0.0.rc.1"
+gemspec.add_dependency "wmi-lite", "~> 1.0"
gemspec
diff --git a/chef.gemspec b/chef.gemspec
index c5508dd854..f4bfae1b94 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
s.add_dependency "mixlib-log", "~> 1.3"
s.add_dependency "mixlib-authentication", "~> 1.3"
s.add_dependency "mixlib-shellout", "~> 1.4"
- s.add_dependency "ohai", "~> 7.0"
+ s.add_dependency "ohai", "= 7.2.0.alpha.0"
s.add_dependency "rest-client", ">= 1.0.4", "< 1.7.0"
# rest-client has an unbounded dependency on mime-types.