Features/batch operation fix whitespace#49
Open
fbarrus wants to merge 18 commits intoKinetic:masterfrom
Open
Conversation
features/batch-operation and kinetic-java batch-operation branch.
option will be set.
tag to key_range example for put, because the drive needs tag in put.
Update program headers and LICENSE file to use "Mozilla Public License, v. 2.0."
This minimizes diffs and merge conflicts to branches that were due to changes in whitespace (as long as the same is done to the branches first too)
Otherwise there are spurious diffs and merge conflicts with branches. (Note that this needs to be done to the branches too) About half the files had it before, and half didn't, and the set of which did and didn't changed on the batch-operation branch
…atch-operation_fix-whitespace Conflicts: README.md src/examples/get_key_range.c src/lib/bus/listener_task.c src/lib/kinetic_admin_client.c This updates the batch-operation branch to master commit 50773c0
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
3 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.
I'm not actually merging this in just yet... just checking it against the master and running the Travis CI tests on it, and having it prepped while I do more testing and code review