From e975956fe102be7b80ed82c9d276782b3af3861e Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <Mitchell@.(none)>
Date: Sat, 29 Jan 2011 20:22:53 -0800
Subject: [PATCH] Update json dep to ~> 1.5.1, which works with Ruby19 on
 Windows

---
 CHANGELOG.md    | 3 ++-
 vagrant.gemspec | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3f824a73..8aa21fdcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 0.7.2 (unreleased)
 
-
+  - Update JSON dependency to 1.5.1, which works with Ruby 1.9 on
+    Windows.
 
 ## 0.7.1 (January 28, 2011)
 
diff --git a/vagrant.gemspec b/vagrant.gemspec
index 0c8e378d1..ac32b5c8e 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "archive-tar-minitar", "= 0.5.2"
   s.add_dependency "erubis", "~> 2.6.6"
-  s.add_dependency "json", "~> 1.4.6"
+  s.add_dependency "json", "~> 1.5.1"
   s.add_dependency "mario", "~> 0.0.6"
   s.add_dependency "net-ssh", "~> 2.1.0"
   s.add_dependency "net-scp", "~> 1.0.4"