summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-02-14 21:23:55 -0800
committerGitHub <noreply@github.com>2018-02-14 21:23:55 -0800
commit20a1c3470fc76cbb4e52b1fde723738f6ade9e61 (patch)
treea5ec40149cb84c6c9da195443facf55b764d22a1
parentf9b72cfc75a2f90b6b7e71b6d78a82b1b09fd09b (diff)
parent94c5f6ba3ad83589acb5a4171328352835f3e739 (diff)
downloadchef-20a1c3470fc76cbb4e52b1fde723738f6ade9e61.tar.gz
Merge pull request #6845 from chef/updates2
Use the updated inspec gem - 1.51.18
-rw-r--r--Gemfile.lock12
-rw-r--r--omnibus/Gemfile.lock32
2 files changed, 27 insertions, 17 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 1d988c756f..bd3f49a141 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -123,12 +123,12 @@ GEM
addressable (2.4.0)
appbundler (0.10.0)
mixlib-cli (~> 1.4)
- ast (2.3.0)
- backports (3.11.0)
+ ast (2.4.0)
+ backports (3.11.1)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
builder (3.2.3)
- byebug (9.1.0)
+ byebug (10.0.0)
chef-vault (3.3.0)
chef-zero (13.1.0)
ffi-yajl (~> 2.2)
@@ -181,7 +181,7 @@ GEM
htmlentities (4.3.4)
httpclient (2.8.3)
iniparse (1.4.4)
- inspec (1.50.1)
+ inspec (1.51.18)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)
@@ -250,8 +250,8 @@ GEM
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
- pry-byebug (3.5.1)
- byebug (~> 9.1)
+ pry-byebug (3.6.0)
+ byebug (~> 10.0)
pry (~> 0.10)
pry-remote (0.1.8)
pry (~> 0.9)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 0a400af685..a36078d763 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,8 +1,8 @@
GIT
remote: https://github.com/chef/omnibus
- revision: 68c301587d8856c6ec4445a24ec49365bb22a314
+ revision: 63e908114e460d47609869ece898c45d7250247b
specs:
- omnibus (5.6.8)
+ omnibus (5.6.9)
aws-sdk (~> 2)
chef-sugar (~> 3.3)
cleanroom (~> 1.0)
@@ -29,13 +29,13 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
- aws-sdk (2.10.128)
- aws-sdk-resources (= 2.10.128)
- aws-sdk-core (2.10.128)
+ aws-sdk (2.10.129)
+ aws-sdk-resources (= 2.10.129)
+ aws-sdk-core (2.10.129)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.10.128)
- aws-sdk-core (= 2.10.128)
+ aws-sdk-resources (2.10.129)
+ aws-sdk-core (= 2.10.129)
aws-sigv4 (1.0.2)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
@@ -91,6 +91,8 @@ GEM
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.21)
+ ffi (1.9.21-x64-mingw32)
+ ffi (1.9.21-x86-mingw32)
ffi-yajl (2.3.1)
libyajl2 (~> 1.2)
fuzzyurl (0.9.0)
@@ -100,6 +102,7 @@ GEM
builder (>= 2.1.2)
hashie (3.5.7)
hitimes (1.2.6)
+ hitimes (1.2.6-x86-mingw32)
httpclient (2.7.2)
iostruct (0.0.4)
ipaddress (0.8.3)
@@ -122,13 +125,16 @@ GEM
mixlib-log
mixlib-authentication (1.4.2)
mixlib-cli (1.7.0)
- mixlib-config (2.2.4)
- mixlib-install (3.9.0)
+ mixlib-config (2.2.5)
+ mixlib-install (3.9.3)
mixlib-shellout
mixlib-versioning
thor
mixlib-log (1.7.1)
mixlib-shellout (2.3.2)
+ mixlib-shellout (2.3.2-universal-mingw32)
+ win32-process (~> 0.8.2)
+ wmi-lite (~> 1.0)
mixlib-versioning (1.2.2)
molinillo (0.4.5)
multi_json (1.13.1)
@@ -171,7 +177,7 @@ GEM
pry-stack_explorer (0.4.9.2)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
- public_suffix (3.0.1)
+ public_suffix (3.0.2)
retryable (2.0.4)
ridley (4.6.1)
addressable
@@ -221,6 +227,8 @@ GEM
varia_model (0.4.1)
buff-extensions (~> 1.0)
hashie (>= 2.0.2, < 4.0.0)
+ win32-process (0.8.3)
+ ffi (>= 1.0.0)
winrm (2.2.3)
builder (>= 2.1.2)
erubis (~> 2.7)
@@ -243,6 +251,8 @@ GEM
PLATFORMS
ruby
+ x64-mingw32
+ x86-mingw32
DEPENDENCIES
berkshelf (~> 4.0)
@@ -257,4 +267,4 @@ DEPENDENCIES
winrm-fs (~> 1.0)
BUNDLED WITH
- 1.15.1
+ 1.16.1