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

Merge riak/2.1 branch to master #977

Open
wants to merge 20 commits into
base: master
Choose a base branch
from

Conversation

JeetKunDoug
Copy link
Contributor

Pulling in updates to tests, especially changes that deal with allow_mult/dvv_enabled.

zeeshanlakhani and others added 20 commits October 13, 2015 15:35
…s-as-per-PR866

yokozuna_rt additions for types and better testing w/ allow-mult=true…
Add debugging to rt:do_commit/1 to track nothing_planned
Updated to attempt to make sure we get the "right" vnode PID.
sure up possible race between upgrade and first check
This makes it much easier to tell which code is being executed at a
given point in the log, since many of the tests print identical log
messages.
Log the start of each test in repl_aae_fullsync
overriding default_bucket_props in advanced_config without
explicitly setting these returns different values with the fix for
allow_mult turning to true with an app.config file present.
…nt_default_bucket_properties

Update tests for different default bucket properties
…_fixes

Forward port changes to proxy_overload_recovery to make it pass in the face of indeterminate behavior.
Move wait_for_vnode_change inside the -ifdef(EQC) clause.
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.

None yet

5 participants