summaryrefslogtreecommitdiff
path: root/omnibus/Gemfile
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-02-28 12:03:07 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2018-02-28 12:03:07 -0800
commitd11104e01578977ce68e835deae2c04627b2ec74 (patch)
treee8ab560a69abfdf41b911948d07fdeb26e775f55 /omnibus/Gemfile
parentbc72676b2454f8a2bd6636daa806b1f4e01fb08c (diff)
downloadchef-d11104e01578977ce68e835deae2c04627b2ec74.tar.gz
chefstyle/omnibus-software/omnibus back to master
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'omnibus/Gemfile')
-rw-r--r--omnibus/Gemfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 9470a86266..67c6bb4571 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
source "https://rubygems.org"
-gem "omnibus", git: "https://github.com/chef/omnibus", branch: "lcg/improve-appbundling"
-gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "lcg/appbundle-0.11-without"
+gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master"
+gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master"
gem "pedump"