-
Notifications
You must be signed in to change notification settings - Fork 25
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
Features/batch operation fix whitespace #49
Open
fbarrus
wants to merge
18
commits into
Kinetic:master
Choose a base branch
from
fbarrus:features/batch-operation_fix-whitespace
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Features/batch operation fix whitespace #49
fbarrus
wants to merge
18
commits into
Kinetic:master
from
fbarrus:features/batch-operation_fix-whitespace
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
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
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.
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