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

Squash some PRs from the original repo #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Squash some PRs from the original repo #2

wants to merge 2 commits into from

Conversation

ice1000
Copy link

@ice1000 ice1000 commented Nov 22, 2018

Signed-off-by: ice1000 [email protected]

Replacing #1

Signed-off-by: ice1000 <[email protected]>
@ice1000
Copy link
Author

ice1000 commented Nov 22, 2018

danburkert#42

# Conflicts:
#	src/pid/io.rs
#	src/pid/mod.rs
#	src/pid/status.rs
@siddontang
Copy link

Please fix CI, add a meaningful title for this PR :-)

@ice1000 ice1000 changed the title Squash #1 Squash some PRs from the original repo Dec 3, 2018
@ice1000
Copy link
Author

ice1000 commented Dec 3, 2018

@siddontang This PR is no longer needed for tikv since the required features are already merged in #3 #4 .
I kept this open because these features might be useful in the future.

@ice1000
Copy link
Author

ice1000 commented Dec 3, 2018

CI failed due to some nightly features are used..
I'll consider fixing them.

@siddontang
Copy link

yes @ice1000

Although TiKV doesn't need these, it is still better to let this repo become more powerful.

I think you can split this PR into multi PRs, it contains many components.

ice1000 added a commit that referenced this pull request Jan 27, 2019
* Fix build on Android

* Try build on android in travis

* Fix test runs on android

* Fix test not running

* Fix for 64 bit android

* Fix for x86 android

* Build for aarch64 and x86 android

* Bump min rust version for x86_64 support

* Keep bumping the rust version till one works

* Bump rust version

* Try using a matrix exclusion to fix build
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants