summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-03-18 16:53:23 -0700
committerGitHub <noreply@github.com>2019-03-18 16:53:23 -0700
commit6364626407cec00398126b3a1cecccc4dc6b90d6 (patch)
tree35e7dfaa2bf27095a2af314e226fdd7702e54756
parentdd8aac97c78d23aa0afb698c1a76e5930ec9978e (diff)
parenteb243990d30327be8b9588325054801a4e54dd4f (diff)
downloadohai-6364626407cec00398126b3a1cecccc4dc6b90d6.tar.gz
Merge pull request #1341 from chef/loosen
Loosen the mixlib pins to allow for new major releases
-rw-r--r--.travis.yml4
-rw-r--r--ohai.gemspec6
2 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 7af67f39..514f08f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,8 +18,8 @@ before_install:
- rm -f .bundle/config
rvm:
- - 2.5.3
- - 2.6
+ - 2.5.5
+ - 2.6.2
- ruby-head
matrix:
diff --git a/ohai.gemspec b/ohai.gemspec
index 1eb358e4..d9c882e2 100644
--- a/ohai.gemspec
+++ b/ohai.gemspec
@@ -17,9 +17,9 @@ Gem::Specification.new do |s|
s.add_dependency "systemu", "~> 2.6.4"
s.add_dependency "ffi-yajl", "~> 2.2"
s.add_dependency "mixlib-cli", ">= 1.7.0" # 1.7+ needed to support passing multiple options
- s.add_dependency "mixlib-config", "~> 2.0"
- s.add_dependency "mixlib-log", "~> 2.0", ">= 2.0.1"
- s.add_dependency "mixlib-shellout", "~> 2.0"
+ s.add_dependency "mixlib-config", ">= 2.0", "< 4.0"
+ s.add_dependency "mixlib-log", ">= 2.0.1", "< 4.0"
+ s.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
s.add_dependency "plist", "~> 3.1"
s.add_dependency "ipaddress"
s.add_dependency "wmi-lite", "~> 1.0"