summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsersut <serdar@opscode.com>2014-01-16 14:15:23 -0800
committersersut <serdar@opscode.com>2014-01-16 14:15:23 -0800
commit4cb3b0bb024b6d3b7d401a3844581643f17ee84d (patch)
tree33f0f67140a164a43f2fb345208417adbdf87d2a
parent17369e52c7e510d62a20c9dd5e144e5dd86c988a (diff)
downloadohai-4cb3b0bb024b6d3b7d401a3844581643f17ee84d.tar.gz
Move the mixlib-shellout version constraint to the gemspec.
-rw-r--r--Gemfile5
-rw-r--r--ohai.gemspec2
2 files changed, 1 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index 2b17af9c..baf5d9b7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,11 +4,6 @@ gemspec
group :development do
- # Fixes https://tickets.opscode.com/browse/MIXLIB-17
- # This line can be removed and replaced with a line in the gemspec that specifies
- # that the mixlib::shellout version be > 1.2.0
- gem "mixlib-shellout", :git => "https://github.com/opscode/mixlib-shellout.git"
-
gem "sigar", :platform => "ruby"
gem 'plist'
diff --git a/ohai.gemspec b/ohai.gemspec
index e9620314..cac54f0f 100644
--- a/ohai.gemspec
+++ b/ohai.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.add_dependency "mixlib-cli"
s.add_dependency "mixlib-config", "~> 2.0"
s.add_dependency "mixlib-log"
- s.add_dependency "mixlib-shellout"
+ s.add_dependency "mixlib-shellout", "~> 1.2"
s.add_dependency "ipaddress"
s.add_development_dependency "rake"
s.add_development_dependency "rspec-core"