Merge branch 'master' into master

This commit is contained in:
Unknwon
2015-12-08 21:20:46 -05:00

View File

@ -1,6 +1,6 @@
# Quick Start
#### Run tidb with docker
#### Run TiDB with docker
You can quickly test tidb with docker, the source repository contains the Dockerfile which
contains local tidb-server.
@ -24,6 +24,10 @@ mysql -h 127.0.0.1 -P 4000 -u root -D test
Notice: OSX user may use `docker-machine ip` to connect it.
#### __Run TiDB on HBase__
Read this [doc](https://github.com/pingcap/tidb/blob/master/docs/HBASE_QUICKSTART.md).
#### __Pre-requirement__
Go environment. Currently a 64-bit version of go >= 1.5 is required.