summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2017-07-10 10:11:54 -0700
committerGitHub <noreply@github.com>2017-07-10 10:11:54 -0700
commit3486748a7609d88e1ae1587687576de7e156f234 (patch)
tree3b43492b08cba2c524ebff8904b177c411058699
parentf8688c220a202bf210d36fc4e35fda917135bc38 (diff)
parent1a776a2cf97b78bb9dfed89990d395700bb17a33 (diff)
downloadchef-3486748a7609d88e1ae1587687576de7e156f234.tar.gz
Merge pull request #6262 from chef/lcg/bundle-update
Except I forgot to bundle update of course
-rw-r--r--Gemfile.lock9
1 files changed, 5 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 84d7625517..3ae8680c3b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -122,6 +122,7 @@ GEM
addressable (2.4.0)
appbundler (0.10.0)
mixlib-cli (~> 1.4)
+ mixlib-shellout (~> 2.0)
ast (2.3.0)
backports (3.8.0)
binding_of_caller (0.7.2)
@@ -149,7 +150,7 @@ GEM
erubis (2.7.0)
ethon (0.10.1)
ffi (>= 1.3.0)
- excon (0.57.0)
+ excon (0.57.1)
faraday (0.12.1)
multipart-post (>= 1.2, < 3)
faraday-http-cache (2.0.0)
@@ -179,9 +180,9 @@ GEM
highline (1.7.8)
htmlentities (4.3.4)
httpclient (2.8.3)
- i18n (0.8.4)
- iniparse (1.4.3)
- inspec (1.30.0)
+ i18n (0.8.6)
+ iniparse (1.4.4)
+ inspec (1.31.1)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)