Permalink
Browse files

Gemfile: pull in Windows changes for omnibus-{ruby,software}

  • Loading branch information...
sdelano committed Dec 13, 2012
1 parent 1225d2d commit 40d83763c45c37e5106a86abeb4c0264a0661b04
Showing with 7 additions and 7 deletions.
  1. +2 −2 Gemfile
  2. +5 −5 Gemfile.lock
View
@@ -4,10 +4,10 @@ omnibus_ruby_local_path = File.expand_path(File.join(File.dirname(__FILE__), "..
omnibus_software_local_path = File.expand_path(File.join(File.dirname(__FILE__), "..", "omnibus-software"))
#gem "omnibus", :path => omnibus_ruby_local_path
-gem "omnibus", :git => "git://github.com/opscode/omnibus-ruby.git", :branch => 'omnibus-windows'
+gem "omnibus", :git => "git://github.com/opscode/omnibus-ruby.git", :branch => 'master'
#gem "omnibus-software", :path => omnibus_software_local_path
-gem "omnibus-software", :git => "git://github.com/opscode/omnibus-software.git", :branch => 'omnibus-windows'
+gem "omnibus-software", :git => "git://github.com/opscode/omnibus-software.git", :branch => 'master'
group :development do
gem "vagrant", "~> 1.0"
View
@@ -1,7 +1,7 @@
GIT
remote: git://github.com/opscode/omnibus-ruby.git
- revision: 9c077939924b503de89b10b7224f68c5da640964
- branch: omnibus-windows
+ revision: 6d88ff4f19f0cc8a046af4355276c00d7688a56e
+ branch: master
specs:
omnibus (0.1)
fpm (= 0.3.11)
@@ -12,8 +12,8 @@ GIT
GIT
remote: git://github.com/opscode/omnibus-software.git
- revision: 40f7b32bf9fc5b0f17be5103468f9fdf05def672
- branch: omnibus-windows
+ revision: 1ed76c30c3d55ad263238c83741f708a7f066618
+ branch: master
specs:
omnibus-software (0.0.1)
@@ -48,7 +48,7 @@ GEM
mixlib-log
systemu
yajl-ruby
- rake (10.0.2)
+ rake (10.0.3)
systemu (2.5.2)
uber-s3 (0.2.4)
mime-types (~> 1.17)

0 comments on commit 40d8376

Please sign in to comment.