summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-11-09 16:35:49 -0800
committerGitHub <noreply@github.com>2018-11-09 16:35:49 -0800
commit25631a3c779928fd004e0f0f0d98bf1bfdba9f3a (patch)
tree332dc41bcdfb83c9cac64e754a607e6329771df4
parentb161757e090d7b4e09bf240b8c89efd51a083d00 (diff)
parente825f9f8373dce1f74f51bd2a6e359270b7e9763 (diff)
downloadchef-25631a3c779928fd004e0f0f0d98bf1bfdba9f3a.tar.gz
Merge pull request #7897 from chef/cacerts
Update deps to bring in the new ca-certs
-rw-r--r--Gemfile.lock6
-rw-r--r--omnibus/Gemfile.lock28
2 files changed, 19 insertions, 15 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 7e1c62226c..e140ec730d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -193,7 +193,7 @@ GEM
launchy (2.4.3)
addressable (~> 2.3)
libyajl2 (1.2.0)
- method_source (0.9.0)
+ method_source (0.9.1)
mixlib-archive (0.4.18)
mixlib-log
mixlib-archive (0.4.18-universal-mingw32)
@@ -232,7 +232,7 @@ GEM
plist (3.4.0)
powerpack (0.1.2)
proxifier (1.0.3)
- pry (0.11.3)
+ pry (0.12.0)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-byebug (3.6.0)
@@ -241,7 +241,7 @@ GEM
pry-remote (0.1.8)
pry (~> 0.9)
slop (~> 3.0)
- pry-stack_explorer (0.4.9.2)
+ pry-stack_explorer (0.4.9.3)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
pusher-client (0.6.2)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index ffb86fdca8..64265fd696 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 3b6ef4c42d8c2f9f9e1c6e285b2ea48e0d0f0fdd
+ revision: 1a5846d7afb9ab8f3005cd04d771b057b19ab514
branch: master
specs:
omnibus-software (4.0.0)
@@ -32,7 +32,7 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
aws-eventstream (1.0.1)
- aws-partitions (1.107.0)
+ aws-partitions (1.109.0)
aws-sdk-core (3.36.0)
aws-eventstream (~> 1.0)
aws-partitions (~> 1.0)
@@ -63,10 +63,10 @@ GEM
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (10.0.2)
- chef (14.6.47)
+ chef (14.7.17)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.47)
+ chef-config (= 14.7.17)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -93,10 +93,10 @@ GEM
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.6.47-universal-mingw32)
+ chef (14.7.17-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.47)
+ chef-config (= 14.7.17)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -125,6 +125,7 @@ GEM
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
win32-api (~> 1.5.3)
+ win32-certstore (>= 0.1.8)
win32-dir (~> 0.5.0)
win32-event (~> 0.6.1)
win32-eventlog (= 0.6.3)
@@ -135,7 +136,7 @@ GEM
win32-taskscheduler (~> 2.0)
windows-api (~> 0.4.4)
wmi-lite (~> 1.0)
- chef-config (14.6.47)
+ chef-config (14.7.17)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -151,7 +152,7 @@ GEM
citrus (3.0.2)
cleanroom (1.0.0)
coderay (1.1.2)
- concurrent-ruby (1.1.0)
+ concurrent-ruby (1.1.3)
debug_inspector (0.0.3)
diff-lcs (1.3)
erubis (2.7.0)
@@ -188,7 +189,7 @@ GEM
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
- method_source (0.9.0)
+ method_source (0.9.1)
minitar (0.7)
mixlib-archive (0.4.18)
mixlib-log
@@ -246,17 +247,17 @@ GEM
plist (3.4.0)
progressbar (1.10.0)
proxifier (1.0.3)
- pry (0.11.3)
+ pry (0.12.0)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-byebug (3.6.0)
byebug (~> 10.0)
pry (~> 0.10)
- pry-stack_explorer (0.4.9.2)
+ pry-stack_explorer (0.4.9.3)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
public_suffix (3.0.3)
- rack (2.0.5)
+ rack (2.0.6)
retryable (2.0.4)
rspec (3.8.0)
rspec-core (~> 3.8.0)
@@ -317,6 +318,9 @@ GEM
tomlrb (1.2.7)
uuidtools (2.1.5)
win32-api (1.5.3-universal-mingw32)
+ win32-certstore (0.1.11)
+ ffi
+ mixlib-shellout
win32-dir (0.5.1)
ffi (>= 1.0.0)
win32-event (0.6.3)