summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-04-17 12:15:53 -0700
committerTim Smith <tsmith@chef.io>2019-04-17 12:15:53 -0700
commit888489fe40d497f4567fc3b6ce0952dfbbe21ce7 (patch)
tree1893cf789182ce2fb04d1ba702ceb2f8db61733a
parentb3db1af39ad6f38d075b6ae374a84cb719e18872 (diff)
downloadchef-888489fe40d497f4567fc3b6ce0952dfbbe21ce7.tar.gz
Update win32-service + bump inspec to 3.9.3
win32-service had a regression that caused service setup in chef to fail. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile.lock8
-rw-r--r--omnibus/Gemfile.lock53
2 files changed, 29 insertions, 32 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 4dc458db39..154108e3b6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -134,7 +134,7 @@ GEM
highline (1.7.10)
htmlentities (4.3.4)
iniparse (1.4.4)
- inspec-core (3.9.0)
+ inspec-core (3.9.3)
addressable (~> 2.4)
faraday (>= 0.9.0)
faraday_middleware (~> 0.12.2)
@@ -206,7 +206,7 @@ GEM
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
parallel (1.17.0)
- parser (2.6.2.0)
+ parser (2.6.2.1)
ast (~> 2.4.0)
parslet (1.8.2)
pastel (0.7.2)
@@ -241,7 +241,7 @@ GEM
rspec-expectations (3.8.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
- rspec-its (1.2.0)
+ rspec-its (1.3.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.8.0)
@@ -346,7 +346,7 @@ GEM
win32-ipc (>= 0.6.0)
win32-process (0.8.3)
ffi (>= 1.0.0)
- win32-service (2.1.2)
+ win32-service (2.1.4)
ffi
ffi-win32-extensions
win32-taskscheduler (2.0.4)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index f4a2326577..d117a46d54 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: 7ad32798cd5893191e4b9bfc5b53e4cc8f32646b
+ revision: af75fc2b244de04e76961c02b30db504d5b1a8f4
branch: master
specs:
- omnibus (6.0.23)
+ omnibus (6.0.25)
aws-sdk-s3 (~> 1)
chef-sugar (>= 3.3)
cleanroom (~> 1.0)
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 8e902b14ff285a57846a41231edc939a9be399d6
+ revision: 0dc67ede1784d56a975cb4a7aea47ad2349bf24a
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.2)
- aws-partitions (1.149.0)
+ aws-partitions (1.150.0)
aws-sdk-core (3.48.3)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
@@ -64,10 +64,10 @@ GEM
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (11.0.1)
- chef (14.11.21)
+ chef (14.12.3)
addressable
bundler (>= 1.10)
- chef-config (= 14.11.21)
+ chef-config (= 14.12.3)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -77,9 +77,9 @@ GEM
iniparse (~> 1.4)
mixlib-archive (>= 0.4, < 2.0)
mixlib-authentication (~> 2.1)
- mixlib-cli (~> 1.7)
- mixlib-log (~> 2.0, >= 2.0.3)
- mixlib-shellout (~> 2.4)
+ mixlib-cli (>= 1.7, < 3.0)
+ mixlib-log (>= 2.0.3, < 4.0)
+ mixlib-shellout (>= 2.4, < 4.0)
net-sftp (~> 2.1, >= 2.1.2)
net-ssh (~> 4.2)
net-ssh-multi (~> 1.2, >= 1.2.1)
@@ -94,10 +94,10 @@ GEM
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.11.21-universal-mingw32)
+ chef (14.12.3-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.11.21)
+ chef-config (= 14.12.3)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -108,9 +108,9 @@ GEM
iso8601 (~> 0.12.1)
mixlib-archive (>= 0.4, < 2.0)
mixlib-authentication (~> 2.1)
- mixlib-cli (~> 1.7)
- mixlib-log (~> 2.0, >= 2.0.3)
- mixlib-shellout (~> 2.4)
+ mixlib-cli (>= 1.7, < 3.0)
+ mixlib-log (>= 2.0.3, < 4.0)
+ mixlib-shellout (>= 2.4, < 4.0)
net-sftp (~> 2.1, >= 2.1.2)
net-ssh (~> 4.2)
net-ssh-multi (~> 1.2, >= 1.2.1)
@@ -126,22 +126,21 @@ GEM
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
win32-api (~> 1.5.3)
- win32-certstore (~> 0.2.4)
+ win32-certstore (~> 0.3)
win32-dir (~> 0.5.0)
win32-event (~> 0.6.1)
win32-eventlog (= 0.6.3)
win32-mmap (~> 0.4.1)
win32-mutex (~> 0.4.2)
win32-process (~> 0.8.2)
- win32-service (~> 1.0)
+ win32-service (>= 1.0, < 3.0)
win32-taskscheduler (~> 2.0)
- windows-api (~> 0.4.4)
wmi-lite (~> 1.0)
- chef-config (14.11.21)
+ chef-config (14.12.3)
addressable
fuzzyurl
- mixlib-config (>= 2.2.12, < 3.0)
- mixlib-shellout (~> 2.0)
+ mixlib-config (>= 2.2.12, < 4.0)
+ mixlib-shellout (>= 2.0, < 4.0)
tomlrb (~> 1.2)
chef-sugar (5.0.1)
chef-zero (14.0.12)
@@ -197,14 +196,14 @@ GEM
mixlib-archive (1.0.1-universal-mingw32)
mixlib-log
mixlib-authentication (2.1.1)
- mixlib-cli (1.7.0)
+ mixlib-cli (2.0.3)
mixlib-config (2.2.18)
tomlrb
- mixlib-install (3.11.11)
+ mixlib-install (3.11.12)
mixlib-shellout
mixlib-versioning
thor
- mixlib-log (2.0.9)
+ mixlib-log (3.0.1)
mixlib-shellout (2.4.4)
mixlib-shellout (2.4.4-universal-mingw32)
win32-process (~> 0.8.2)
@@ -269,7 +268,7 @@ GEM
rspec-expectations (3.8.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
- rspec-its (1.2.0)
+ rspec-its (1.3.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.8.0)
@@ -319,7 +318,7 @@ GEM
tomlrb (1.2.8)
uuidtools (2.1.5)
win32-api (1.5.3-universal-mingw32)
- win32-certstore (0.2.4)
+ win32-certstore (0.3.0)
ffi
mixlib-shellout
win32-dir (0.5.1)
@@ -336,14 +335,12 @@ GEM
win32-ipc (>= 0.6.0)
win32-process (0.8.3)
ffi (>= 1.0.0)
- win32-service (1.0.1)
+ win32-service (2.1.4)
ffi
ffi-win32-extensions
win32-taskscheduler (2.0.4)
ffi
structured_warnings
- windows-api (0.4.4)
- win32-api (>= 1.4.5)
winrm (2.3.1)
builder (>= 2.1.2)
erubis (~> 2.7)