summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-08-09 16:47:23 -0700
committerGitHub <noreply@github.com>2016-08-09 16:47:23 -0700
commit51bb14443501259891d19b42aecee4c0bdaba5f1 (patch)
tree7c65ad6b9801954d96e24a48314440d1315b6cda
parent822d730cd5b1524e80a5b5e26a0efc3b370d2fd3 (diff)
parent8bc6655db287b97167f071c5a577f9096fc31718 (diff)
downloadchef-51bb14443501259891d19b42aecee4c0bdaba5f1.tar.gz
Merge pull request #5184 from chef/jk/update-branch
Update omnibus and omnibus-software to latest master
-rw-r--r--omnibus/Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index f7fce6a32c..f7657dc134 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/chef/omnibus-software.git
- revision: bea616217d9e0255ced8277d41c43070bcdc1a28
+ revision: b1a068c75d4eb0833c6c3884f7e0692ab1f29fb1
branch: ksubrama/ruby23
specs:
omnibus-software (4.0.0)
@@ -9,7 +9,7 @@ GIT
GIT
remote: git://github.com/chef/omnibus.git
- revision: 45daf5afbef664bb1866561671ec94ccfe307bc6
+ revision: 7461ec540c52251800258286ba8984725125ebe2
branch: ksubrama/gcc_investigate
specs:
omnibus (5.4.0)