Skip to content

Commit 4c1b531

Browse files
authored
Merge pull request #79 from basho/mas-i1750-nodeconfirms
Mas i1750 nodeconfirms
2 parents 74fb2c5 + e45c3af commit 4c1b531

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

rebar.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{webmachine, ".*", {git, "git://github.com/basho/webmachine", {tag, "riak_kv-2.9.1"}}},
1111

1212
%% riak-erlang-client for riakc_obj
13-
{riakc, ".*", {git, "git://github.com/basho/riak-erlang-client", {tag, "riak_kv-2.9.1"}}}
13+
{riakc, ".*", {git, "git://github.com/basho/riak-erlang-client", {branch, "develop-2.9"}}}
1414
]}.
1515
{edoc_opts,
1616
[

src/rhc.erl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -797,6 +797,8 @@ counter_val(Rhc, Bucket, Key) ->
797797
%% <dd>if `true' not_found replies from vnodes count toward read quorum.</dd>
798798
%% <dt>`basic_quorum'</dt>
799799
%% <dd>When set to `true' riak will return a value as soon as it gets a quorum of responses.</dd>
800+
%% <dt>`node_confirms'</dt>
801+
%% <dd>The number of separate nodes which host vnodes that need to be consulted as part of the fetch.</dd>
800802
%% </dl>
801803
%% See the riak docs at http://docs.basho.com/riak/latest/references/apis/http/ for details
802804
-spec counter_val(rhc(), term(), term(), list()) -> {ok, integer()} | {error, term()}.
@@ -1515,7 +1517,7 @@ options(#rhc{options=Options}) ->
15151517
%% @doc Extract the list of query parameters to use for a GET
15161518
%% @spec get_q_params(rhc(), proplist()) -> proplist()
15171519
get_q_params(Rhc, Options) ->
1518-
options_list([r,pr,timeout], Options ++ options(Rhc)).
1520+
options_list([r,pr,notfound_ok,node_confirms,timeout], Options ++ options(Rhc)).
15191521

15201522
%% @doc Extract the list of query parameters to use for a PUT
15211523
%% @spec put_q_params(rhc(), proplist()) -> proplist()
@@ -1535,7 +1537,7 @@ delete_q_params(Rhc, Options) ->
15351537
options_list([r,w,dw,pr,pw,rw,timeout], Options ++ options(Rhc)).
15361538

15371539
fetch_type_q_params(Rhc, Options) ->
1538-
options_list([r,pr,basic_quorum,notfound_ok,timeout,include_context], Options ++ options(Rhc)).
1540+
options_list([r,pr,basic_quorum,node_confirms,notfound_ok,timeout,include_context], Options ++ options(Rhc)).
15391541

15401542
update_type_q_params(Rhc, Options) ->
15411543
options_list([r,w,dw,pr,pw,basic_quorum, node_confirms,

0 commit comments

Comments
 (0)