summaryrefslogtreecommitdiff
path: root/omnibus
diff options
context:
space:
mode:
authorScott Hain <shain@chef.io>2016-09-28 15:26:24 -0700
committerMatt Wrock <matt@mattwrock.com>2016-09-28 15:26:24 -0700
commitb1a32c2ad23429a8ed770aa282c7f73ca8ba1119 (patch)
tree3105bcc4d0eaec4ecbb0df9c697ee9bbf664cde8 /omnibus
parent76965965f8fc581f03082d35abeedec5e88da1e2 (diff)
downloadchef-b1a32c2ad23429a8ed770aa282c7f73ca8ba1119.tar.gz
Add branch off of lcg/ruby23 that includes some openssl solaris fixes (#5396)
Diffstat (limited to 'omnibus')
-rw-r--r--omnibus/Gemfile2
-rw-r--r--omnibus/Gemfile.lock6
2 files changed, 4 insertions, 4 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 45cad13e4f..735b371c62 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
source "https://rubygems.org"
gem "omnibus", github: "chef/omnibus", branch: "rhass/COOL-502_with_gcc_investigate"
-gem "omnibus-software", github: "chef/omnibus-software", branch: "lcg/ruby23"
+gem "omnibus-software", github: "chef/omnibus-software", branch: "shain/ruby_windows_monster"
gem "license_scout", github: "chef/license_scout"
gem "pedump"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 0c2d218bdd..8976b06765 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -8,8 +8,8 @@ GIT
GIT
remote: git://github.com/chef/omnibus-software.git
- revision: f0f4bb4beab18a9b6adbc0a34bcd2f0caf10be5c
- branch: lcg/ruby23
+ revision: 4ce91af05b8be7d46feac765d0fc24eb28e62c68
+ branch: shain/ruby_windows_monster
specs:
omnibus-software (4.0.0)
chef-sugar (>= 3.4.0)
@@ -262,4 +262,4 @@ DEPENDENCIES
winrm-fs (~> 1.0)
BUNDLED WITH
- 1.12.5
+ 1.13.1