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

Fix macOS build #176

Merged
merged 4 commits into from
Dec 14, 2017
Merged

Fix macOS build #176

merged 4 commits into from
Dec 14, 2017

Conversation

messense
Copy link

Also enabled macOS build on Travis CI to test it.

@siddontang
Copy link

Thanks @messense

PTAL @BusyJay

.travis.yml Outdated
@@ -12,6 +12,7 @@ cache:

os:
- linux
- osx
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only stable compiler on OS X needs to be tested.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@messense
Copy link
Author

@BusyJay PTAL

Copy link
Member

@BusyJay BusyJay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@BusyJay BusyJay merged commit 4bb0219 into tikv:master Dec 14, 2017
@BusyJay
Copy link
Member

BusyJay commented Dec 14, 2017

Thanks!

@messense messense deleted the feature/osx branch December 15, 2017 01:28
yiwu-arbug pushed a commit that referenced this pull request Jun 4, 2020
update titan to include tikv/titan#169 for tikv-4.x

include the following changes
```
81814ec 2020-06-04 zbk602423539@gmail.. Fix GC may delete a already deleted blob file (#168) (#169)
80657c0 2020-06-04 zbk602423539@gmail.. Fix wrong assert delta < 0 for cocurrent compaction while flush (#172) (#176)
0db7976 2020-06-04 sre-bot@pingcap.com  Fix wrong live data size when encounter rewrite failure (#161) (#175)
c41f2a2 2020-06-04 sre-bot@pingcap.com  feat: Titan should return user value to compaction filter #163 (#164) (#174)
```

Signed-off-by: sre-bot <sre-bot@pingcap.com>
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