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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update upstream to 5.0.1. #29

Merged
merged 2 commits into from
Jan 13, 2017
Merged

Update upstream to 5.0.1. #29

merged 2 commits into from
Jan 13, 2017

Conversation

petermattis
Copy link
Contributor

No description provided.

@petermattis
Copy link
Contributor Author

diff --git a/import.sh b/import.sh
index 3d6dbfd..5d20924 100755
--- a/import.sh
+++ b/import.sh
@@ -32,9 +32,9 @@ set -eu

 rm -rf internal/*
 find . -type l -not -path './.git/*' | xargs rm
-curl -sL https://github.com/facebook/rocksdb/archive/v4.11.2.tar.gz | tar zxf - -C internal --strip-components=1
+curl -sL https://github.com/facebook/rocksdb/archive/v5.0.1.tar.gz | tar zxf - -C internal --strip-components=1
 make -C internal util/build_version.cc
-patch -p1 < gitignore.patch
+# patch -p1 < gitignore.patch
 patch -p1 < testharness.patch
 # Downcase some windows-only includes for compatibility with mingw64.
 grep -lRF '<Windows.h>' internal | xargs sed -i~ 's!<Windows.h>!<windows.h>!g'

@tamird
Copy link
Contributor

tamird commented Jan 13, 2017

Why'd you comment out the gitignore patch? If it's no longer needed, let's remove it.

@petermattis
Copy link
Contributor Author

Yes, the gitignore patch is no longer needed. Removed along with the other unused patches.

@petermattis petermattis merged commit b49ad71 into master Jan 13, 2017
@petermattis petermattis deleted the pmattis/rocksdb-5.0.1 branch January 13, 2017 17:06
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.

None yet

2 participants