Permalink
Browse files

Merge pull request #238 from branch 'bwf-no-luke'

  • Loading branch information...
Bryan Fink
Bryan Fink committed Nov 14, 2012
2 parents 406cd2e + e02d645 commit 852bd01bd439abfd748e1ce2e69560759b61f65d
Showing with 0 additions and 9 deletions.
  1. +0 −1 Makefile
  2. +0 −6 rel/files/app.config
  3. +0 −2 rel/reltool.config
View
@@ -78,7 +78,6 @@ stage : rel
##
docs:
./rebar skip_deps=true doc
- @cp -R apps/luke/doc doc/luke
@cp -R apps/riak_core/doc doc/riak_core
@cp -R apps/riak_kv/doc doc/riak_kv
View
@@ -83,12 +83,6 @@
%% mapred_name is URL used to submit map/reduce requests to Riak.
{mapred_name, "mapred"},
- %% mapred_system indicates which version of the MapReduce
- %% system should be used: 'pipe' means riak_pipe will
- %% power MapReduce queries, while 'legacy' means that luke
- %% will be used
- {mapred_system, pipe},
-
%% mapred_2i_pipe indicates whether secondary-index
%% MapReduce inputs are queued in parallel via their own
%% pipe ('true'), or serially via a helper process
View
@@ -16,7 +16,6 @@
erlang_js,
mochiweb,
webmachine,
- luke,
basho_stats,
bitcask,
riak_core,
@@ -42,7 +41,6 @@
{excl_archive_filters, [".*"]},
{app, cluster_info, [{incl_cond, include}]},
{app, erlang_js, [{incl_cond, include}]},
- {app, luke, [{incl_cond, include}]},
{app, ebloom, []},
{app, bitcask, [{incl_cond, include}]},
{app, riak_core, [{incl_cond, include}]},

0 comments on commit 852bd01

Please sign in to comment.