Skip to content

Commit

Permalink
rename ext -> extern
Browse files Browse the repository at this point in the history
  • Loading branch information
dongxu committed Dec 22, 2014
1 parent 63c6a41 commit cc90bb5
Show file tree
Hide file tree
Showing 568 changed files with 23 additions and 12,124 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ build-config:

build-server:
@mkdir -p bin
make -j4 -C ext/redis-2.8.13/
@cp -f ext/redis-2.8.13/src/redis-server bin/codis-server
make -j4 -C extern/redis-2.8.13/
@cp -f extern/redis-2.8.13/src/redis-server bin/codis-server

clean:
@rm -rf bin
@rm -f *.rdb *.out *.log *.dump deploy.tar
@rm -f Dockerfile ext/Dockerfile
@rm -f Dockerfile extern/Dockerfile
@if [ -d test ]; then cd test && rm -f *.out *.log *.rdb; fi

distclean: clean
@make --no-print-directory --quiet -C ext/redis-2.8.13 clean
@make --no-print-directory --quiet -C extern/redis-2.8.13 clean

gotest:
go test ./... -race
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ English (WIP)

## For Java users who want to support HA

[Jodis \(HA Codis Connection Pool based on Jedis\)] (https://github.com/wandoulabs/codis/tree/master/ext/jodis)
[Jodis \(HA Codis Connection Pool based on Jedis\)] (https://github.com/wandoulabs/codis/tree/master/extern/jodis)

## Architecture

Expand Down
2 changes: 1 addition & 1 deletion doc/FAQ_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ CAS 暂时不支持, 但是如果非得支持, 我们可以考虑. Lua 脚本考

###现有redis集群上有上T的数据,如何迁移到Codis上来?

为了提高 Codis 推广和部署上的效率,我们为数据迁移提供了一个叫做 [redis-port](https://github.com/wandoulabs/codis/tree/master/ext/redis-port) 的命令行工具,它能够:
为了提高 Codis 推广和部署上的效率,我们为数据迁移提供了一个叫做 [redis-port](https://github.com/wandoulabs/codis/tree/master/extern/redis-port) 的命令行工具,它能够:

+ 静态分析 RDB 文件,包括解析以及恢复 RDB 数据到 redis
+ 从 redis 上 dump RDB 文件以及从 redis 和 codis 之间动态同步数据
Expand Down
2 changes: 1 addition & 1 deletion docker/mkredis.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

cd ../ext || exit $?
cd ../extern || exit $?

docker rmi codis/redis

Expand Down
1 change: 0 additions & 1 deletion ext/redis-2.8.13/deps/jemalloc/VERSION

This file was deleted.

Loading

0 comments on commit cc90bb5

Please sign in to comment.