summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Wright <patrick@chef.io>2016-09-28 15:39:49 -0700
committerPatrick Wright <patrick@chef.io>2016-09-28 15:39:49 -0700
commit9ec29f2a0d5a7cf8456326bcd837d0aef83f55f2 (patch)
tree641481b9f399f589f7ce4c0b490f3970d59005d2
parent76965965f8fc581f03082d35abeedec5e88da1e2 (diff)
downloadchef-9ec29f2a0d5a7cf8456326bcd837d0aef83f55f2.tar.gz
update acceptance dependencies
-rw-r--r--acceptance/Gemfile3
-rw-r--r--acceptance/Gemfile.lock15
2 files changed, 7 insertions, 11 deletions
diff --git a/acceptance/Gemfile b/acceptance/Gemfile
index 59f232fcd3..83f9f7dcfc 100644
--- a/acceptance/Gemfile
+++ b/acceptance/Gemfile
@@ -11,6 +11,3 @@ gem "kitchen-inspec"
gem "test-kitchen"
gem "winrm-elevated"
gem "berkshelf", "4.3.5"
-
-# until 2.0.0 is fixed for unstable packages
-gem "mixlib-install", "1.2.3"
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index 20f8374cd9..d9691f5827 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -11,12 +11,12 @@ GEM
specs:
addressable (2.4.0)
artifactory (2.5.0)
- aws-sdk (2.6.3)
- aws-sdk-resources (= 2.6.3)
- aws-sdk-core (2.6.3)
+ aws-sdk (2.6.4)
+ aws-sdk-resources (= 2.6.4)
+ aws-sdk-core (2.6.4)
jmespath (~> 1.0)
- aws-sdk-resources (2.6.3)
- aws-sdk-core (= 2.6.3)
+ aws-sdk-resources (2.6.4)
+ aws-sdk-core (= 2.6.4)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -65,7 +65,7 @@ GEM
excon (>= 0.38.0)
json
erubis (2.7.0)
- excon (0.52.0)
+ excon (0.53.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.14)
@@ -115,7 +115,7 @@ GEM
mixlib-authentication (1.4.1)
mixlib-log
mixlib-config (2.2.4)
- mixlib-install (1.2.3)
+ mixlib-install (2.0.1)
artifactory
mixlib-shellout
mixlib-versioning
@@ -239,7 +239,6 @@ DEPENDENCIES
kitchen-ec2
kitchen-inspec
kitchen-vagrant
- mixlib-install (= 1.2.3)
test-kitchen
windows_chef_zero
winrm-elevated