diff options
author | tyler-ball <tyleraball@gmail.com> | 2016-01-21 12:52:23 -0700 |
---|---|---|
committer | tyler-ball <tyleraball@gmail.com> | 2016-01-21 12:52:23 -0700 |
commit | c1d0c183cdecb2f1eb708ebbc3b7e04538e8d63d (patch) | |
tree | b0fe5df7ec2802f02d34909dc7c1d3a0145bee77 /omnibus | |
parent | 5233fe583b601bc9fbaf4751a47858292bb11d15 (diff) | |
download | chef-c1d0c183cdecb2f1eb708ebbc3b7e04538e8d63d.tar.gz |
Pointing omnibus-software back to master now that https://github.com/chef/omnibus-software/pull/552 is mergedtball/nexus7_test_failures
Diffstat (limited to 'omnibus')
-rw-r--r-- | omnibus/Gemfile | 2 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 8b2d627972..12001d1c17 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gem "omnibus", github: "chef/omnibus" -gem "omnibus-software", github: "chef/omnibus-software", branch: "tball/no_more_thor" +gem "omnibus-software", github: "chef/omnibus-software" # This development group is installed by default when you run `bundle install`, # but if you are using Omnibus in a CI-based infrastructure, you do not need diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 98ba98bcb4..9b6757287e 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,7 +1,6 @@ GIT remote: git://github.com/chef/omnibus-software.git - revision: 2d3bebe8b83666564ecbb93d9f1a0d23ba62f9ee - branch: tball/no_more_thor + revision: 5c7ad9dbcbf11aaa6326446ab4128ec23685c33d specs: omnibus-software (4.0.0) |