summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2017-04-12 11:54:27 +0100
committerThom May <thom@chef.io>2017-04-12 11:54:27 +0100
commitfc17e08a3936ff543f8279e21e182f37c97b8c70 (patch)
treea52ce67ee828665fc689923527773d31c99235a2
parent2c0e360d121291d44dd736a9b9a7f610676771cd (diff)
downloadchef-tm/chase_gems.tar.gz
Use updated omnibus softwaretm/chase_gems
Fixes: #6049 Signed-off-by: Thom May <thom@chef.io>
-rw-r--r--omnibus/Gemfile2
-rw-r--r--omnibus/Gemfile.lock3
2 files changed, 2 insertions, 3 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index b41a5bdd0d..652a6e69b8 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
source "https://rubygems.org"
gem "omnibus", git: "https://github.com/chef/omnibus"
-gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "tm/copy_ruby_bins"
+gem "omnibus-software", git: "https://github.com/chef/omnibus-software"
gem "license_scout", git: "https://github.com/chef/license_scout"
gem "pedump"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index af9cec00d5..3d32a97a15 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -25,8 +25,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 23d2dd83dd55b6d0260b1a48160b018157db7cd9
- branch: tm/copy_ruby_bins
+ revision: cae44c1a3ebf7207516813ba15b372231c253954
specs:
omnibus-software (4.0.0)
chef-sugar (>= 3.4.0)