summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKartik Null Cating-Subramanian <ksubramanian@chef.io>2016-06-17 15:14:05 -0400
committerKartik Null Cating-Subramanian <ksubramanian@chef.io>2016-06-17 15:14:05 -0400
commit3959c504ab0b05a2239bce09e7ff61fa42a20ee9 (patch)
treeae93c64226ee06b92046417125a1965514d1fb2e
parentbab900b86a66edefcce9c84fffd868994468e5cf (diff)
downloadchef-ksubrama/msys2.tar.gz
-rw-r--r--omnibus/Gemfile4
-rw-r--r--omnibus/Gemfile.lock6
2 files changed, 6 insertions, 4 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index ef1dec354d..f8e70d1d43 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
source "https://rubygems.org"
-gem "omnibus", git: "https://github.com/chef/omnibus.git"
-gem "omnibus-software", git: "https://github.com/chef/omnibus-software.git"
+gem "omnibus", git: "https://github.com/chef/omnibus.git", branch: "ksubrama/msys2"
+gem "omnibus-software", git: "https://github.com/chef/omnibus-software.git", branch: "ksubrama/msys2"
# pedump pessimistically pins multipart-post to a version from 2013 which makes
# bundler very unhappy. Remove this when upstream has merged zed-0xff/pedump#6 .
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 8e3011984e..5c26bc3215 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,13 +1,15 @@
GIT
remote: https://github.com/chef/omnibus-software.git
- revision: 60eea7a3971d764fca2c7104a8aa46dff4261625
+ revision: 92d13d4dc24edf5f28ed872e502fd9e6fb3a9b15
+ branch: ksubrama/msys2
specs:
omnibus-software (4.0.0)
omnibus (>= 5.2.0)
GIT
remote: https://github.com/chef/omnibus.git
- revision: 2a597277f1a5e13901d116ef852611fe88f6b76b
+ revision: 1be5fb4e5d49a2d4574968752a1c3780118ec918
+ branch: ksubrama/msys2
specs:
omnibus (5.4.0)
aws-sdk (~> 2)