summaryrefslogtreecommitdiff
path: root/acceptance
diff options
context:
space:
mode:
authorMatt Wrock <matt@mattwrock.com>2016-09-16 11:32:27 -0700
committerMatt Wrock <matt@mattwrock.com>2016-09-16 11:32:27 -0700
commitbece91140eca16f163ae1694e014ef768d8d52c8 (patch)
tree4e14f38f579544ea5293896b990a7191ba6a3b29 /acceptance
parentc30c3fb4003bdf3a4f5b44f28d0dcb9aeae89fa6 (diff)
downloadchef-bece91140eca16f163ae1694e014ef768d8d52c8.tar.gz
update acceptance and omnibus deps
Diffstat (limited to 'acceptance')
-rw-r--r--acceptance/Gemfile.lock35
-rw-r--r--acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb2
2 files changed, 19 insertions, 18 deletions
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index e8951abbf0..265f8eebf8 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -10,13 +10,13 @@ GEM
remote: https://rubygems.org/
specs:
addressable (2.4.0)
- artifactory (2.3.3)
- aws-sdk (2.5.11)
- aws-sdk-resources (= 2.5.11)
- aws-sdk-core (2.5.11)
+ artifactory (2.5.0)
+ aws-sdk (2.6.1)
+ aws-sdk-resources (= 2.6.1)
+ aws-sdk-core (2.6.1)
jmespath (~> 1.0)
- aws-sdk-resources (2.5.11)
- aws-sdk-core (= 2.5.11)
+ aws-sdk-resources (2.6.1)
+ aws-sdk-core (= 2.6.1)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -53,7 +53,8 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
- chef-config (12.13.37)
+ chef-config (12.14.60)
+ addressable
fuzzyurl
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
@@ -73,10 +74,10 @@ GEM
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
- hashie (3.4.4)
+ hashie (3.4.6)
hitimes (1.2.4)
httpclient (2.7.2)
- inspec (0.34.0)
+ inspec (0.34.1)
hashie (~> 3.4)
json (>= 1.8, < 3.0)
method_source (~> 0.8)
@@ -92,7 +93,7 @@ GEM
train (>= 0.19.0, < 1.0)
jmespath (1.3.1)
json (2.0.2)
- kitchen-ec2 (1.1.0)
+ kitchen-ec2 (1.2.0)
aws-sdk (~> 2)
excon
multi_json
@@ -114,7 +115,7 @@ GEM
mixlib-authentication (1.4.1)
mixlib-log
mixlib-config (2.2.4)
- mixlib-install (1.1.0)
+ mixlib-install (1.2.0)
artifactory
mixlib-shellout
mixlib-versioning
@@ -174,7 +175,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
- rubyntlm (0.6.0)
+ rubyntlm (0.6.1)
rubyzip (1.2.0)
safe_yaml (1.0.4)
sawyer (0.7.0)
@@ -186,8 +187,8 @@ GEM
molinillo (~> 0.4.2)
semverse (~> 1.1)
sslshake (1.0.12)
- test-kitchen (1.12.0)
- mixlib-install (~> 1.0, >= 1.0.4)
+ test-kitchen (1.13.0)
+ mixlib-install (~> 1.2)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)
net-ssh (>= 2.9, < 4.0)
@@ -197,7 +198,7 @@ GEM
thor (0.19.1)
timers (4.0.4)
hitimes
- train (0.19.0)
+ train (0.19.1)
docker-api (~> 1.26)
json (>= 1.8, < 3.0)
mixlib-shellout (~> 2.0)
@@ -210,7 +211,7 @@ GEM
hashie (>= 2.0.2, < 4.0.0)
windows_chef_zero (2.0.0)
test-kitchen (>= 1.2.1)
- winrm (2.0.1)
+ winrm (2.0.2)
builder (>= 2.1.2)
erubis (~> 2.7)
gssapi (~> 1.2)
@@ -218,7 +219,7 @@ GEM
httpclient (~> 2.2, >= 2.2.0.2)
logging (>= 1.6.1, < 3.0)
nori (~> 2.0)
- rubyntlm (~> 0.6.0)
+ rubyntlm (~> 0.6.0, >= 0.6.1)
winrm-elevated (1.0.0)
winrm (~> 2.0)
winrm-fs (~> 1.0)
diff --git a/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb b/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb
index 6b2fcf69c8..73f5151bca 100644
--- a/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb
+++ b/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb
@@ -18,7 +18,7 @@ class TopCookbooks < Chef::Resource
end
cookbook_kitchen "#{command} learn-the-basics-windows" do
- repository "mwrock/learn-chef-acceptance"
+ repository "learn-chef/learn-chef-acceptance"
cookbook_relative_dir "cookbooks/learn-the-basics-windows"
end