dont use branched omnibus

chef-boneyard · May 3, 2016 · 5f99167 · 5f99167
1 parent 5cbbf2d
commit 5f99167
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "omnibus", git: "https://github.com/chef/omnibus.git", branch: "openssl_catch"
+gem "omnibus", git: "https://github.com/chef/omnibus.git"
 gem "omnibus-software", git: "https://github.com/chef/omnibus-software.git", branch: "UW-2/git_on_windows"
 
 # pedump pessimistically pins multipart-post to a version from 2013 which makes

diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
@@ -9,7 +9,6 @@ GIT
 GIT
   remote: https://github.com/chef/omnibus.git
   revision: b4ea1b01e6b13fe4397053c292092bdfa03d9c82
-  branch: openssl_catch
   specs:
     omnibus (5.4.0)
       aws-sdk (~> 2)