Merge pull request #76 from juliandunn/vagrant-1.2.7

Bump to Vagrant 1.2.7
chef · Aug 29, 2013 · b7ca1dd · b7ca1dd
2 parents ffece80 + 033b1b4
commit b7ca1dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.2.2'
+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 "em-winrm" # for windows!

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -20,14 +20,13 @@ GIT
 
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: 7e400d00a3c5a0fdf2809c8b5001a035415a607b
-  tag: v1.2.2
+  revision: 7ec0ee1d00a916f80b109a298bab08e391945243
+  tag: v1.2.7
   specs:
-    vagrant (1.2.2)
+    vagrant (1.2.7)
       childprocess (~> 0.3.7)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
-      json (>= 1.5.1, < 1.8.0)
       log4r (~> 1.1.9)
       net-scp (~> 1.1.0)
       net-ssh (~> 2.6.6)