summaryrefslogtreecommitdiff
path: root/omnibus
diff options
context:
space:
mode:
authorTom Duffield <tom@chef.io>2017-01-19 14:47:17 -0600
committerTom Duffield <tom@chef.io>2017-01-19 14:47:17 -0600
commit8dca9c68e249f43b100cc1cb0a7e3ece2eea3000 (patch)
tree756524de9d4b761aa6a5fcd434ab6ca5a64a38c8 /omnibus
parent9705a2b0d540f15a10f6bacb91b827c302f48748 (diff)
downloadchef-8dca9c68e249f43b100cc1cb0a7e3ece2eea3000.tar.gz
Revert omnibus-software to ruby_windows_monster branchrhass/COOL-657_ecc-algorithm-support
Signed-off-by: Tom Duffield <tom@chef.io>
Diffstat (limited to 'omnibus')
-rw-r--r--omnibus/Gemfile2
-rw-r--r--omnibus/Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 2bcc49ea24..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: "rhass/COOL-657_ecc-algorithm-support+ruby_windows_monster"
+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 4409ea83ed..8454d6aed4 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -8,8 +8,8 @@ GIT
GIT
remote: git://github.com/chef/omnibus-software.git
- revision: e17ce57df791747037142a91089eb880c08b6fb5
- branch: rhass/COOL-657_ecc-algorithm-support+ruby_windows_monster
+ revision: f4b1c0f2682907967d10c64850f9c607070697dd
+ branch: shain/ruby_windows_monster
specs:
omnibus-software (4.0.0)
chef-sugar (>= 3.4.0)