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

Commit

Permalink
Merge pull request #1269 from chef/lcg/bump-deps2
Browse files Browse the repository at this point in the history
bump the Gemfile.lock deps
  • Loading branch information
lamont-granquist authored May 31, 2017
2 parents e0292a7 + bc6852a commit bbedac8
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 19 deletions.
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ group(:omnibus_package) do
gem "chef-provisioning-aws", ">= 2.0"
gem "chef-provisioning-azure", ">= 0.6.0"
gem "chef-provisioning-fog", ">= 0.20.0"
gem "chef-provisioning-vagrant", ">= 0.11.0"
gem "chef-vault"
# The chef version is pinned by "rake dependencies", which grabs the current version from omnibus.
gem "chef", "= 13.0.118"
Expand Down
33 changes: 15 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -48,29 +48,29 @@ GEM
addressable (>= 2.3.1)
extlib (>= 0.9.15)
multi_json (>= 1.0.0)
aws-sdk (2.9.25)
aws-sdk-resources (= 2.9.25)
aws-sdk-core (2.9.25)
aws-sdk (2.9.26)
aws-sdk-resources (= 2.9.26)
aws-sdk-core (2.9.26)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.9.25)
aws-sdk-core (= 2.9.25)
aws-sdk-resources (2.9.26)
aws-sdk-core (= 2.9.26)
aws-sdk-v1 (1.67.0)
json (~> 1.4)
nokogiri (~> 1)
aws-sigv4 (1.0.0)
berkshelf (6.0.1)
berkshelf (6.1.0)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (>= 2.0.2, < 4.0)
buff-config (~> 2.0)
buff-extensions (~> 2.0)
buff-shell_out (~> 1.0)
cleanroom (~> 1.0)
concurrent-ruby (~> 1.0)
faraday (~> 0.9)
httpclient (~> 2.7)
minitar (~> 0.5, >= 0.5.4)
mixlib-archive (~> 0.4)
mixlib-shellout (~> 2.0)
octokit (~> 4.0)
retryable (~> 2.0)
ridley (~> 5.0)
Expand Down Expand Up @@ -202,8 +202,6 @@ GEM
google-api-client (~> 0.8.0)
retryable
winrm-elevated
chef-provisioning-vagrant (0.11.0)
chef-provisioning
chef-sugar (3.4.0)
chef-vault (3.0.3)
chef-zero (13.0.0)
Expand All @@ -224,7 +222,7 @@ GEM
concurrent-ruby (1.0.5)
cookbook-omnifetch (0.6.0)
mixlib-archive (~> 0.4)
cookstyle (1.3.1)
cookstyle (1.4.0)
rubocop (= 0.47.1)
cucumber (2.4.0)
builder (>= 2.1.2)
Expand All @@ -251,7 +249,7 @@ GEM
excon (>= 0.38.0)
json
erubis (2.7.0)
excon (0.55.0)
excon (0.56.0)
extlib (0.9.16)
faraday (0.12.1)
multipart-post (>= 1.2, < 3)
Expand Down Expand Up @@ -354,7 +352,7 @@ GEM
multi_json (~> 1.10)
fog-local (0.3.1)
fog-core (~> 1.27)
fog-openstack (0.1.20)
fog-openstack (0.1.21)
fog-core (>= 1.40)
fog-json (>= 1.0)
ipaddress (>= 0.8)
Expand Down Expand Up @@ -460,11 +458,11 @@ GEM
hitimes (1.2.5)
hitimes (1.2.5-x86-mingw32)
httpclient (2.8.3)
i18n (0.8.1)
i18n (0.8.4)
inflecto (0.0.2)
inifile (3.0.0)
iniparse (1.4.2)
inspec (1.25.1)
inspec (1.26.0)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)
Expand All @@ -482,7 +480,7 @@ GEM
sslshake (~> 1.2)
thor (~> 0.19)
toml (~> 0.1)
train (>= 0.22.0, < 1.0)
train (>= 0.24.0, < 1.0)
ipaddress (0.8.3)
iso8601 (0.9.1)
jmespath (1.3.1)
Expand Down Expand Up @@ -569,7 +567,7 @@ GEM
net-ssh (>= 2.6.5)
net-ssh-gateway (>= 1.2.0)
net-telnet (0.1.1)
nio4r (2.0.0)
nio4r (2.1.0)
nokogiri (1.7.2)
mini_portile2 (~> 2.1.0)
nokogiri (1.7.2-x64-mingw32)
Expand Down Expand Up @@ -740,7 +738,7 @@ GEM
hitimes
toml (0.1.2)
parslet (~> 1.5.0)
train (0.23.0)
train (0.24.0)
docker-api (~> 1.26)
json (>= 1.8, < 3.0)
mixlib-shellout (~> 2.0)
Expand Down Expand Up @@ -822,7 +820,6 @@ DEPENDENCIES
chef-provisioning-aws (>= 2.0)
chef-provisioning-azure (>= 0.6.0)
chef-provisioning-fog (>= 0.20.0)
chef-provisioning-vagrant (>= 0.11.0)
chef-sugar
chef-vault
cheffish (>= 13.0)
Expand Down

0 comments on commit bbedac8

Please sign in to comment.