summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-04-13 14:14:29 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2018-04-13 14:14:29 -0700
commit96b020fd9816fea07ec4ed81a597becdb016e629 (patch)
tree0536639e31053326c70efda59af27bb14e47db11
parent89af0c684e2c64a9ae2e21d5687660f1baa53d89 (diff)
downloadchef-lcg/improve-appbundling.tar.gz
testing appbundle branchlcg/improve-appbundling
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--omnibus/Gemfile2
-rw-r--r--omnibus/Gemfile.lock22
2 files changed, 12 insertions, 12 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 5457f0f40b..c2f1095ff5 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,6 +1,6 @@
source "https://rubygems.org"
-gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master"
+gem "omnibus", git: "https://github.com/chef/omnibus", branch: "lcg/improve-appbundling"
gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master"
gem "pedump"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 1b12f8f85f..3263be3e46 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: 41c5d2eaa819587b631d893e613612a96031c8af
- branch: master
+ revision: 9aa7f313814e643e41c9fca010909b31e9e6fdfd
+ branch: lcg/improve-appbundling
specs:
- omnibus (5.6.10)
+ omnibus (5.6.11)
aws-sdk (~> 2)
chef-sugar (~> 3.3)
cleanroom (~> 1.0)
@@ -31,13 +31,13 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
- aws-sdk (2.11.27)
- aws-sdk-resources (= 2.11.27)
- aws-sdk-core (2.11.27)
+ aws-sdk (2.11.33)
+ aws-sdk-resources (= 2.11.33)
+ aws-sdk-core (2.11.33)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.11.27)
- aws-sdk-core (= 2.11.27)
+ aws-sdk-resources (2.11.33)
+ aws-sdk-core (= 2.11.33)
aws-sigv4 (1.0.2)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
@@ -108,7 +108,7 @@ GEM
httpclient (2.7.2)
iostruct (0.0.4)
ipaddress (0.8.3)
- jmespath (1.3.1)
+ jmespath (1.4.0)
json (2.1.0)
kitchen-vagrant (1.3.1)
test-kitchen (~> 1.4)
@@ -125,7 +125,7 @@ GEM
minitar (0.6.1)
mixlib-archive (0.4.1)
mixlib-log
- mixlib-authentication (1.4.2)
+ mixlib-authentication (2.0.0)
mixlib-cli (1.7.0)
mixlib-config (2.2.6)
tomlrb
@@ -151,7 +151,7 @@ GEM
nori (2.6.0)
octokit (4.8.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (13.8.0)
+ ohai (13.9.0)
chef-config (>= 12.5.0.alpha.1, < 14)
ffi (~> 1.9)
ffi-yajl (~> 2.2)