From ad12aea4018c232f2c03e2c2179a5d7888022322 Mon Sep 17 00:00:00 2001
From: Drew Kerrigan <dkerrigan@basho.com>
Date: Tue, 4 Feb 2014 11:20:55 -0500
Subject: [PATCH] updating for riak_json_http refactor

---
 rebar.config       | 2 +-
 rel/reltool.config | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rebar.config b/rebar.config
index 8b97b0ab1..9d6dceab8 100644
--- a/rebar.config
+++ b/rebar.config
@@ -22,7 +22,7 @@
         {riak_control, ".*", {git, "git://github.com/basho/riak_control.git", {branch, "develop"}}},
         {riaknostic, ".*", {git, "git://github.com/basho/riaknostic.git", {branch, "develop"}}},
         {yokozuna, ".*", {git, "git://github.com/basho/yokozuna.git", {branch, "develop"}}},
-        {riak_json, ".*", {git, "git://github.com/basho-labs/riak_json.git", {branch, "master"}}},
+        {riak_json_http, ".*", {git, "git://github.com/basho-labs/riak_json_http.git", {branch, "master"}}},
         {riak_auth_mods, ".*", {git, "git://github.com/basho/riak_auth_mods.git", {branch, "develop"}}},
         {rebar_lock_deps_plugin, ".*", {git, "git://github.com/seth/rebar_lock_deps_plugin.git", {branch, "master"}}}
        ]}.
diff --git a/rel/reltool.config b/rel/reltool.config
index fc7625731..1a6a9e774 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -25,7 +25,7 @@
          riak_search,
          riak_api,
          yokozuna,
-         riak_json,
+         riak_json_http,
          cluster_info,
          riak_control,
          erlydtl,
@@ -56,7 +56,7 @@
        {app, riak_kv, [{incl_cond, include}]},
        {app, riak_search, [{incl_cond, include}]},
        {app, yokozuna, [{incl_cond, include}]},
-       {app, riak_json, [{incl_cond, include}]},
+       {app, riak_json_http, [{incl_cond, include}]},
        {app, eper, [{incl_cond, include}]},
        {app, sasl, [{incl_cond, include}]},
        {app, syslog, [{incl_cond, include}]},
@@ -113,7 +113,7 @@
            {template, "../deps/riak_kv/priv/multi_backend.schema", "lib/20-multi_backend.schema"},
            {template, "../deps/eleveldb/priv/eleveldb.schema", "lib/21-leveldb.schema"},
            {template, "../deps/yokozuna/priv/yokozuna.schema", "lib/30-yokozuna.schema"},
-           {template, "../deps/riak_json/priv/riak_json.schema", "lib/31-riak_json.schema"},
+           {template, "../deps/riak_json_http/priv/riak_json_http.schema", "lib/31-riak_json_http.schema"},
 
            %% Copy additional bin scripts
            {template, "files/riak-admin", "bin/riak-admin"},