Merge from upstream #3
Merged
Conversation
This file contains 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
add stats-bind-any -a option
Allow an optional instance name for consistent hashing
remove whitechar in nc_conf.h(very trivial)
…ed; use crc32a for the correct crc32 implementation
Update README.md
redis-integer-reply
support integer reply in multi-bulk reply
support osx kqueue
support for set ex/px/nx/xx for redis 2.6.12 and up
Replace the MD5 code with an alternative implementation, better suited to this codebase.
…d to this codebase (paravoid).
nutcracker is a daemon, so it obviously belongs to /usr/sbin, not /usr/bin/.
Add a nutcracker.8 manpage mostly based off nutcracker --help.
Add a manpage
Move nutcracker to sbin instead of bin
Update README.md
Conflicts: src/nc_conf.c src/nc_message.h
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.
Merging from upstream.
Reviewed by Steve Salevan - (via email)
Please review changes of upstream twemproxy merge to tumblr/twemproxy
[1] Diff of changes between tumblr/twemproxy/master and twitter/twemproxy/master
- These are the changes that we introduced.
[2] Diff of changes between tumblr/twemproxy/master and tumblr/twemproxy/merge-from-upstream
- Changes introduces from upstream (new version of twemproxy)
[3] Diff of changes between twitter/twemproxy/master and tumblr/twemproxy/merge-from-upstream
- This diff should be the same as [1], proof that we are keeping our patches intact.
There was a mention of patches that did not apply, and I did not find that to be the case. I will wait until I hear a definite we are happy with the changes before I merge tumblr/twemproxy/merge-from-upstream into tumblr/twemproxy/master (diff [3])
[1] twitter:master...master
[2] master...merge-from-upstream
[3] twitter:master...merge-from-upstream