Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

Pull in the latest chef-provisioning, kitchen-vagrant, and train #1657

Merged
merged 1 commit into from
Aug 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ GEM
mixlib-shellout (~> 2.0)
artifactory (2.8.2)
ast (2.4.0)
aws-sdk (2.11.106)
aws-sdk-resources (= 2.11.106)
aws-sdk-core (2.11.106)
aws-sdk (2.11.108)
aws-sdk-resources (= 2.11.108)
aws-sdk-core (2.11.108)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.11.106)
aws-sdk-core (= 2.11.106)
aws-sdk-resources (2.11.108)
aws-sdk-core (= 2.11.108)
aws-sigv4 (1.0.3)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
Expand Down Expand Up @@ -159,7 +159,7 @@ GEM
mixlib-config (>= 2.2.12, < 3.0)
mixlib-shellout (~> 2.0)
tomlrb (~> 1.2)
chef-provisioning (2.7.1)
chef-provisioning (2.7.2)
cheffish (>= 4.0, < 15.0)
inifile (>= 2.0.2)
mixlib-install (>= 1.0)
Expand Down Expand Up @@ -368,7 +368,7 @@ GEM
thor (>= 0.18.1)
gyoku (1.3.1)
builder (>= 2.1.2)
hashie (3.5.7)
hashie (3.6.0)
highline (1.7.10)
htmlentities (4.3.4)
http (2.2.2)
Expand Down Expand Up @@ -440,7 +440,7 @@ GEM
hashie (~> 3.4)
inspec (>= 0.34.0, < 3.0.0)
test-kitchen (~> 1.6)
kitchen-vagrant (1.3.2)
kitchen-vagrant (1.3.3)
test-kitchen (~> 1.4)
knife-acl (1.0.3)
knife-cloud (1.2.1)
Expand Down Expand Up @@ -486,9 +486,9 @@ GEM
lumberjack (1.0.13)
memoist (0.16.0)
method_source (0.9.0)
mime-types (3.1)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mime-types-data (3.2018.0812)
mini_portile2 (2.3.0)
minitar (0.6.1)
minitest (5.11.3)
Expand Down Expand Up @@ -588,7 +588,7 @@ GEM
pry-stack_explorer (0.4.9.2)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
public_suffix (3.0.2)
public_suffix (3.0.3)
r18n-core (3.0.5)
r18n-desktop (3.0.5)
r18n-core (= 3.0.5)
Expand Down Expand Up @@ -696,7 +696,7 @@ GEM
toml-rb (1.1.1)
citrus (~> 3.0, > 3.0)
tomlrb (1.2.7)
train (1.4.25)
train (1.4.29)
aws-sdk (~> 2)
azure_mgmt_resources (~> 0.15)
docker-api (~> 1.26)
Expand All @@ -706,7 +706,7 @@ GEM
json (>= 1.8, < 3.0)
mixlib-shellout (~> 2.0)
net-scp (~> 1.2)
net-ssh (>= 2.9, < 5.0)
net-ssh (>= 2.9, < 6.0)
winrm (~> 2.0)
winrm-fs (~> 1.0)
treetop (1.6.10)
Expand Down
4 changes: 2 additions & 2 deletions omnibus/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ gem "pedump"
# by running `bundle install --without development` to speed up build times.
group :development do
# Use Berkshelf for resolving cookbook dependencies
gem "berkshelf"
gem "berkshelf", ">= 7.0"

# Use Test Kitchen with Vagrant for converging the build environment
gem "test-kitchen"
gem "test-kitchen", ">= 1.23"
gem "kitchen-vagrant"
gem "winrm-elevated"
end
16 changes: 8 additions & 8 deletions omnibus/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
aws-sdk (2.11.107)
aws-sdk-resources (= 2.11.107)
aws-sdk-core (2.11.107)
aws-sdk (2.11.108)
aws-sdk-resources (= 2.11.108)
aws-sdk-core (2.11.108)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.11.107)
aws-sdk-core (= 2.11.107)
aws-sdk-resources (2.11.108)
aws-sdk-core (= 2.11.108)
aws-sigv4 (1.0.3)
berkshelf (7.0.6)
chef (>= 13.6.52)
Expand Down Expand Up @@ -232,7 +232,7 @@ GEM
plist (3.4.0)
progressbar (1.10.0)
proxifier (1.0.3)
public_suffix (3.0.2)
public_suffix (3.0.3)
rack (2.0.5)
retryable (2.0.4)
rspec (3.8.0)
Expand Down Expand Up @@ -342,12 +342,12 @@ PLATFORMS
x86-mingw32

DEPENDENCIES
berkshelf
berkshelf (>= 7.0)
kitchen-vagrant
omnibus!
omnibus-software!
pedump
test-kitchen
test-kitchen (>= 1.23)
winrm-elevated

BUNDLED WITH
Expand Down