Merged
Conversation
(cherry picked from commit 4f936c3)
(cherry picked from commit 7744c34)
Use the custom script for running the tests; override the tools.mk target. (cherry picked from commit f70cf2b)
Use custom script for tests.
Add Apache 2 License to 2.0
Port Ian's synctree lock fix to 2.0
Conflicts: Makefile rebar.config
forward merge 2.0 Reviewed-by: zeeshanlakhani
Update the lager version to 2.2.0 Reviewed-by: cuyler
Bump eleveldb to 2.2.14 for Riak 2.2.0 release Reviewed-by: nickelization
Pick up fix for write buffer data loss bug
Upgrade eleveldb to 2.2.15 Reviewed-by: bsparrow435
Conflicts: rebar.config
Forward merge "develop" into "develop-2.2" Reviewed-by: nickelization
No reason to reimplement this functionality when we can just use the code in the application module.
This takes a bit of extra code, but is more idiomatic and predictable than the old approach.
This will come in handy for a new test I'm about to commit
This allows us to verify that watchers get removed from the internal state when they unsubscribe or die.
Seeing this message may be indicative of a bug, but most operators aren't going to care about this particular message, so switch it from warning to debug.
Various post-merge fixes Reviewed-by: JeetKunDoug
…oating on 2.2 branch)
Merge 2.0 into develop 2.2
Add debug log messages for peer state transitions
Bumped eleveldb dependency to 2.0.28
Bumped eleveldb to 2.0.29
Update lager to 3.2.1
Contributor
|
+1 6c785cd |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.