Skip to content

Commit

Permalink
Use right timeout config
Browse files Browse the repository at this point in the history
  • Loading branch information
kuenishi committed Jul 17, 2015
1 parent 71b0916 commit 2d72a4a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/riak_cs_gc.erl
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ mark_manifests(RiakObject, Bucket, Key, UUIDsToMark, ManiFunction, RcPid) ->
%% again without having to re-retrieve the object
{ok, ManifestPbc} = riak_cs_riak_client:manifest_pbc(RcPid),
riak_cs_pbc:put(ManifestPbc, UpdObj, [return_body],
riak_cs_config:put_gckey_timeout(), %% <= bug: put_manifest_timeout should be used here
riak_cs_config:put_manifest_timeout(),
[riakc, put_manifest]).

-spec maybe_delete_small_objects([cs_uuid_and_manifest()], riak_client(), non_neg_integer()) ->
Expand Down

6 comments on commit 2d72a4a

@shino
Copy link
Contributor

@shino shino commented on 2d72a4a Jul 24, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from shino
at 2d72a4a

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging basho/riak_cs/bugfix/proper-timeout = 2d72a4a into borshop-integration-1184-bugfix/proper-timeout

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

basho/riak_cs/bugfix/proper-timeout = 2d72a4a merged ok, testing candidate = 423ac0d

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding develop to borshop-integration-1184-bugfix/proper-timeout = 423ac0d

Please sign in to comment.