From 64f4c95705ef0b9f7fed5bf7527bad0a9530c33a Mon Sep 17 00:00:00 2001
From: Tim Dysinger <tim@dysinger.net>
Date: Tue, 16 Aug 2011 09:07:15 -1000
Subject: [PATCH] Upgraded vagrant but had to hold back json gem because of
 chef

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 6b9b675..0c6f407 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,6 @@ group :chef do
 end
 
 group :vagrant do
-  gem "vagrant", "< 0.7.7"
+  gem "vagrant", "~> 0.8.5" ; gem "json", "1.5.2"
   gem "veewee", "~> 0.2.0"
 end