summaryrefslogtreecommitdiff
path: root/omnibus/Gemfile
diff options
context:
space:
mode:
authorRyan Hass <rhass@users.noreply.github.com>2017-03-08 10:13:45 -0800
committerRyan Hass <rhass@users.noreply.github.com>2017-03-08 14:21:24 -0800
commit50d8edc46882210243b85fb8f48534e44b63da91 (patch)
tree28a93a5de43d0c3a80ebd7f261aa39d301fa5b5d /omnibus/Gemfile
parentbcc7c657b36deafd54c0a5a84ab1a5dca7f8e972 (diff)
downloadchef-50d8edc46882210243b85fb8f48534e44b63da91.tar.gz
Use omnibus-toolchain on Windows platforms.windows_toolchain
This updates the branch pinnings to use the omnibus-toolchain enabled version of omnibus and omnibus-software. Signed-off-by: Ryan Hass <rhass@users.noreply.github.com>
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 2c0072af96..652a6e69b8 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
source "https://rubygems.org"
-gem "omnibus", git: "https://github.com/chef/omnibus", branch: "rhass/COOL-502_with_gcc_investigate"
-gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "shain/ruby_windows_monster"
+gem "omnibus", git: "https://github.com/chef/omnibus"
+gem "omnibus-software", git: "https://github.com/chef/omnibus-software"
gem "license_scout", git: "https://github.com/chef/license_scout"
gem "pedump"