summaryrefslogtreecommitdiff
path: root/chef-x86-mingw32.gemspec
diff options
context:
space:
mode:
authoradamedx <adamed@opscode.com>2014-01-02 11:05:19 -0800
committeradamedx <adamed@opscode.com>2014-01-02 11:05:19 -0800
commit9b282142a05482d7409675e20e2f9e546bd66fc2 (patch)
tree63d8e77c4262e596c379ab5c1cfb9c3834d921f6 /chef-x86-mingw32.gemspec
parentf3bdf78119446508061e667df0084d66594f95a7 (diff)
parent9b0137346a36c69bc492cb30178b6b6843691d47 (diff)
downloadchef-9b282142a05482d7409675e20e2f9e546bd66fc2.tar.gz
Resolve merge conflict with mixlib-shellout change
Diffstat (limited to 'chef-x86-mingw32.gemspec')
-rw-r--r--chef-x86-mingw32.gemspec2
1 files changed, 1 insertions, 1 deletions
diff --git a/chef-x86-mingw32.gemspec b/chef-x86-mingw32.gemspec
index 40e7128831..b0ff015a68 100644
--- a/chef-x86-mingw32.gemspec
+++ b/chef-x86-mingw32.gemspec
@@ -3,7 +3,7 @@ gemspec = eval(IO.read(File.expand_path("../chef.gemspec", __FILE__)))
gemspec.platform = "x86-mingw32"
-gemspec.add_dependency "ffi", "1.3.1"
+gemspec.add_dependency "ffi", "1.5.0"
gemspec.add_dependency "rdp-ruby-wmi", "0.3.1"
gemspec.add_dependency "windows-api", "0.4.2"
gemspec.add_dependency "windows-pr", "1.2.2"