summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Hain <shain@chef.io>2018-01-19 14:17:57 -0800
committerScott Hain <shain@chef.io>2018-01-19 14:17:57 -0800
commit66f7a42e307a2fede06bf9d6c6312657c3edb034 (patch)
tree7cd1107feff7943cc03025a2a40dee1beeff2fb5
parent3b6800b84eeb7bd8f84a748ac6734104fdac04b4 (diff)
downloadchef-shain/config_test.tar.gz
Testing cachingshain/config_test
Signed-off-by: Scott Hain <shain@chef.io>
-rw-r--r--omnibus/Gemfile2
-rw-r--r--omnibus/Gemfile.lock21
2 files changed, 12 insertions, 11 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 652a6e69b8..e591bf06b5 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,6 +1,6 @@
source "https://rubygems.org"
-gem "omnibus", git: "https://github.com/chef/omnibus"
+gem "omnibus", git: "https://github.com/chef/omnibus", branch: "shain/allow_cache_suffix"
gem "omnibus-software", git: "https://github.com/chef/omnibus-software"
gem "license_scout", git: "https://github.com/chef/license_scout"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 928cc8eeaf..bfaee3e95c 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -9,7 +9,8 @@ GIT
GIT
remote: https://github.com/chef/omnibus
- revision: f6f9973bd65af06a6b3077b3ee094ca203b1d612
+ revision: 288d9e72c127d5f13e3652ed37c8bf7068747a72
+ branch: shain/allow_cache_suffix
specs:
omnibus (5.6.1)
aws-sdk (~> 2)
@@ -38,13 +39,13 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
- aws-sdk (2.10.112)
- aws-sdk-resources (= 2.10.112)
- aws-sdk-core (2.10.112)
+ aws-sdk (2.10.122)
+ aws-sdk-resources (= 2.10.122)
+ aws-sdk-core (2.10.122)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.10.112)
- aws-sdk-core (= 2.10.112)
+ aws-sdk-resources (2.10.122)
+ aws-sdk-core (= 2.10.122)
aws-sigv4 (1.0.2)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
@@ -68,7 +69,7 @@ GEM
faraday (~> 0.9.1)
httpclient (~> 2.7.0)
ridley (~> 4.5)
- binding_of_caller (0.7.3)
+ binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
buff-config (1.0.1)
buff-extensions (~> 1.0)
@@ -141,7 +142,7 @@ GEM
wmi-lite (~> 1.0)
mixlib-versioning (1.2.2)
molinillo (0.4.5)
- multi_json (1.12.2)
+ multi_json (1.13.1)
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
@@ -152,7 +153,7 @@ GEM
nori (2.6.0)
octokit (4.8.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (8.25.1)
+ ohai (8.26.0)
chef-config (>= 12.5.0.alpha.1, < 14)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -212,7 +213,7 @@ GEM
molinillo (~> 0.4.2)
semverse (~> 1.1)
systemu (2.6.5)
- test-kitchen (1.19.2)
+ test-kitchen (1.20.0)
mixlib-install (~> 3.6)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)