anchor.diff:  %%      across the cluster.
   %%      See the map/reduce documentation for explanation of behavior.
   mapred_bucket_stream(Pid, Bucket, Query, ClientPid, Timeout) ->
  +    mapred_bucket_stream(Pid, Bucket, Query, ClientPid, Timeout,
  +                         default_timeout(mapred_bucket_stream_call_timeout)).
  +
  +%% @spec mapred_bucket_stream(Pid :: pid(),
  +%%                            Bucket :: bucket(),
  +%%                            Query :: [riak_kv_mapred_query:mapred_queryterm()],
  +%%                            ClientPid :: pid(),
  +%%                            TimeoutMillisecs :: integer() | 'infinity') ->
  +%%       {ok, {ReqId :: term(), MR_FSM_PID :: pid()}} |
  +%%       {error, Err :: term()}
  +%% @doc Perform a streaming map/reduce job against a bucket with a server timeout
  +%%      across the cluster and a call timeout.
  +%%      See the map/reduce documentation for explanation of behavior.
  +mapred_bucket_stream(Pid, Bucket, Query, ClientPid, Timeout, CallTimeout) ->
       MapRed = [{'inputs', Bucket},
                 {'query', Query},
                 {'timeout', Timeout}],
  -    send_mapred_req(Pid, MapRed, ClientPid).
  +    send_mapred_req(Pid, MapRed, ClientPid, CallTimeout).
   
   
   %% @doc Execute a search query. This command will return an error 
  
positive.code:          get/3, get/4, get/5,
           put/2, put/3, put/4,
           delete/3, delete/4, delete/5,
           list_buckets/1, list_buckets/2,
           list_keys/2, list_keys/3,
           stream_list_keys/2, stream_list_keys/3,
           get_bucket/2, get_bucket/3,
           set_bucket/3, set_bucket/4,
           mapred/3, mapred/4,
           mapred_stream/4, mapred_stream/5,
           mapred_bucket/3, mapred_bucket/4,
           mapred_bucket_stream/5,
           search/3, search/5,
           default_timeout/1]).
  
  -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
  
negative.code: 
  %% Common code for sending a single bucket or multiple inputs map/request
  %% @private
  send_mapred_req(Pid, MapRed, ClientPid, CallTimeout) ->
      ReqMsg = #rpbmapredreq{request = encode_mapred_req(MapRed),
                             content_type = <<"application/x-erlang-binary">>},
      ReqId = mk_reqid(),
      %% Add an extra 100ms to the mapred timeout and use that for the 
      %% socket timeout.  This should give the map/reduce a chance to fail and let us know.
      Timeout = proplists:get_value(timeout, MapRed, default_timeout(mapred_timeout)) + 100,
      gen_server:call(Pid, {req, ReqMsg, Timeout, {ReqId, ClientPid}}, CallTimeout).
  
  %% @private
  %% Make a new request that can be sent or queued
  