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.

Sign up for GitHub

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

Jump to bottom

Update to redis 3.2.12 #1552

Open
wants to merge 4 commits into
base: release3.2
Choose a base branch
from
Open

Update to redis 3.2.12 #1552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cbe96c1
sync with upstream 3.2.12 @590f537
fancy-rabbit Aug 20, 2018
378433b
apply patches
fancy-rabbit Aug 20, 2018
a03f634
Update Makefile
fancy-rabbit Aug 20, 2018
0fbf480
fix build
fancy-rabbit Aug 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 8 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ codis-fe: codis-deps
codis-server:
@mkdir -p bin
@rm -f bin/codis-server*
make -j4 -C extern/redis-3.2.11/
@cp -f extern/redis-3.2.11/src/redis-server bin/codis-server
@cp -f extern/redis-3.2.11/src/redis-benchmark bin/
@cp -f extern/redis-3.2.11/src/redis-cli bin/
@cp -f extern/redis-3.2.11/src/redis-sentinel bin/
@cp -f extern/redis-3.2.11/redis.conf config/
@sed -e "s/^sentinel/# sentinel/g" extern/redis-3.2.11/sentinel.conf > config/sentinel.conf
make -j4 -C extern/redis-3.2.12/
@cp -f extern/redis-3.2.12/src/redis-server bin/codis-server
@cp -f extern/redis-3.2.12/src/redis-benchmark bin/
@cp -f extern/redis-3.2.12/src/redis-cli bin/
@cp -f extern/redis-3.2.12/src/redis-sentinel bin/
@cp -f extern/redis-3.2.12/redis.conf config/
@sed -e "s/^sentinel/# sentinel/g" extern/redis-3.2.12/sentinel.conf > config/sentinel.conf

clean-gotest:
@rm -rf ./pkg/topom/gotest.tmp
Expand All @@ -45,7 +45,7 @@ clean: clean-gotest
@rm -rf scripts/tmp

distclean: clean
@make --no-print-directory --quiet -C extern/redis-3.2.11 distclean
@make --no-print-directory --quiet -C extern/redis-3.2.12 distclean
@make --no-print-directory --quiet -C vendor/github.com/spinlock/jemalloc-go/ distclean

gotest: codis-deps
Expand Down
29 changes: 29 additions & 0 deletions extern/redis-3.2.12/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
.*.swp
*.o
*.log
dump.rdb
redis-benchmark
redis-check-aof
redis-check-rdb
redis-check-dump
redis-cli
redis-sentinel
redis-server
doc-tools
release
misc/*
src/release.h
appendonly.aof
SHORT_TERM_TODO
release.h
src/transfer.sh
src/configs
redis.ds
src/redis.conf
src/nodes.conf
deps/lua/src/lua
deps/lua/src/luac
deps/lua/src/liblua.a
.make-*
.prerequisites
*.dSYM
Loading