Port 1.4 changes to the 2.0 branch. #480
Merged
Conversation
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
|
We'll need to do something w/ the ranch dep: https://github.com/basho/riak_core/blob/develop/rebar.config#L15 |
Contributor
Author
|
In what way? |
Conflicts: ebin/riak_core.app src/riak_core_connection.erl test/riak_core_connection_mgr_tests.erl test/riak_core_connection_tests.erl test/riak_core_service_mgr_tests.erl
Conflicts: ebin/riak_core.app src/riak_core_connection_mgr.erl src/riak_core_service_mgr.erl
|
it only exists in riak_core because of the conn_mgr stuff. It should probably go back to repl. |
Contributor
Author
|
Added commit to remove ranch dependency. |
|
+1 |
cmeiklejohn
added a commit
that referenced
this pull request
Dec 12, 2013
Port 1.4 changes to the 2.0 branch.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Port 1.4 changes to the 2.0 branch.
@metadave