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

Forward merge of bugfix-dvv-validation from 2.0 to 2.1. #1174

Merged
merged 1 commit into from
Aug 21, 2015

Conversation

fadushin
Copy link
Contributor

This commit required some manual merging of both the production and EQC test code, due to conflicts with the write_once changes and to the refactor of the EQC test in riak_kv_bucket.

This commit required some manual merging of both the production and EQC test code.
@JeetKunDoug
Copy link
Contributor

👍 5fc2699

borshop added a commit that referenced this pull request Aug 21, 2015
Forward merge of bugfix-dvv-validation from 2.0 to 2.1.

Reviewed-by: JeetKunDoug
@JeetKunDoug
Copy link
Contributor

@borshop merge

@borshop borshop merged commit 5fc2699 into 2.1 Aug 21, 2015
@fadushin fadushin deleted the bugfix/fwd-merge-lww-dvv-validation branch August 21, 2015 17:49
@JeetKunDoug
Copy link
Contributor

This forward merges the fix for https://bashoeng.atlassian.net/browse/RIAK-1743

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