From 953eb1db95dad5c16767b8c560a5a6ab47c26ca4 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Wed, 11 Jan 2012 02:31:21 -0800
Subject: [PATCH] we can now use an up-to-date json gem now that chef is gone
 [ci skip]

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 71d8c197a..b6d66e53f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -61,7 +61,7 @@ gem 'jammit', '0.6.5'
 
 # JSON and API
 
-gem 'json', '1.5.2'
+gem 'json'
 gem 'vanna', :git => 'git://github.com/MikeSofaer/vanna.git'
 gem 'acts_as_api'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index fd8cc7999..0758beb38 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -207,7 +207,7 @@ GEM
       rspec (>= 1.3.1)
       selenium-webdriver (>= 0.1.3)
     jasmine-core (1.1.0)
-    json (1.5.2)
+    json (1.6.4)
     jsonpath (0.4.2)
       multi_json
     jwt (0.1.3)
@@ -442,7 +442,7 @@ DEPENDENCIES
   i18n-inflector-rails (~> 1.0)
   jammit (= 0.6.5)
   jasmine (~> 1.1.2)
-  json (= 1.5.2)
+  json
   jwt (= 0.1.3)
   linecache (= 0.46)
   messagebus_ruby_api (= 1.0.1)