Skip to content
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
wants to merge 18 commits into
base: master
Choose a base branch
from

Conversation

fbarrus
Copy link

@fbarrus fbarrus commented Jan 15, 2016

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

liuxian9 and others added 18 commits March 23, 2015 15:55
features/batch-operation and kinetic-java batch-operation branch.
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants