Merge pull request #80 from juliandunn/update-vagrant-windows-gem

Updated to vagrant-windows that works under Vagrant 1.2 and 1.3
chef · Sep 24, 2013 · 97c4cb7 · 97c4cb7
2 parents b259387 + 4e17f1d
commit 97c4cb7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,6 +2,6 @@ source "https://rubygems.org"
 
 gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.2.7'
 gem "veewee", :git => 'https://github.com/jedi4ever/veewee.git', :ref => '4e5d50de48'
-gem "vagrant-windows", "~> 1.0.0" # still not working with Vagrant 1.2 btw
+gem "vagrant-windows", "~> 1.2.1"
 gem "em-winrm" # for windows!
 gem "rake"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -115,8 +115,7 @@ GEM
       wasabi (~> 1.0)
     thor (0.18.1)
     uuidtools (2.1.3)
-    vagrant-windows (1.0.1)
-      highline
+    vagrant-windows (1.2.1)
       winrm (~> 1.1.1)
     wasabi (1.0.0)
       nokogiri (>= 1.4.0)
@@ -136,5 +135,5 @@ DEPENDENCIES
   em-winrm
   rake
   vagrant!
-  vagrant-windows (~> 1.0.0)
+  vagrant-windows (~> 1.2.1)
   veewee!