Skip to content

Commit

Permalink
updating for riak_json_http refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
Drew Kerrigan committed Mar 18, 2014
1 parent c3acdc7 commit ad12aea
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion rebar.config
Expand Up @@ -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"}}}
]}.
Expand Down
6 changes: 3 additions & 3 deletions rel/reltool.config
Expand Up @@ -25,7 +25,7 @@
riak_search,
riak_api,
yokozuna,
riak_json,
riak_json_http,
cluster_info,
riak_control,
erlydtl,
Expand Down Expand Up @@ -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}]},
Expand Down Expand Up @@ -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"},
Expand Down

0 comments on commit ad12aea

Please sign in to comment.