Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add node_confirms option to PUT request #371

Merged
merged 6 commits into from
Mar 22, 2018
Merged

Add node_confirms option to PUT request #371

merged 6 commits into from
Mar 22, 2018

Conversation

russelldb
Copy link
Member

And counter/datatype operations. NOTE: depends on riak-2.2.5
node_confirms feature.

Depends on:
basho/riak_pb#228

Depended on:
basho/riak_kv#1663

Also add a long timeout to the datatype tests as they failed once or
twice on timeout (I suspect it might have been a network issue acquiring
an EQC license, but having a timeout hurts no one.)
As part of setting up for the 2.2.5 release I made a temp branch off the
last released tag, this takes that branch back into the branch the tag
was cut from.
And counter/datatype operations. NOTE: depends on riak-2.2.5
`node_confirms` feature.
@russelldb
Copy link
Member Author

Travis fails because it doesn't know to use the riak_pb branch that this pull request builds on, is there anyway around that? Change the rebar.config and then change it back before/after merging?

@bryanhuntesl
Copy link

Am I correct in understanding the fail is due to the referenced p/r (riak_kv/riak_pb) not having been merged yet ?

@russelldb
Copy link
Member Author

right, but I wonder if we can just tell travis to use the right branch somehow?

@bryanhuntesl
Copy link

bryanhuntesl commented Feb 26, 2018

The only think I could think of would be to send up a .gitconfig with the aproprate aliases in place but that's probably more effort than it's worth. When we get on rebar3, profiles could also be an option; but again, a lot of effort. I'll try to get the two dependent p/r reviewed today.

@russelldb
Copy link
Member Author

merged pb and tada, travis is super-green

@nickkeers nickkeers self-assigned this Mar 20, 2018
@nickkeers nickkeers self-requested a review March 20, 2018 10:58
Copy link

@nickkeers nickkeers left a comment

Choose a reason for hiding this comment

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

👍 Looks fine to me

@bryanhuntesl
Copy link

ship-it-squirrel

@russelldb russelldb merged commit d07f9ee into basho:develop-2.2 Mar 22, 2018
@russelldb russelldb deleted the feature/rdb/node-confirms branch March 22, 2018 15:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants