回退分组的代码修复bug
Merge branch 'master' of https://github.com/opencloudb/Mycat-Server

Conflicts:
	src/main/java/org/opencloudb/mpp/DataMergeService.java
	src/main/java/org/opencloudb/mpp/MutiDataMergeService.java
Merge branch 'master' of https://github.com/opencloudb/Mycat-Server

Conflicts:
	src/main/java/org/opencloudb/mpp/DataMergeService.java
Merge branch 'master' of https://github.com/opencloudb/Mycat-Server

Conflicts:
	src/main/java/org/opencloudb/mpp/DataMergeService.java
resolve conflict

Conflicts:
	src/main/java/org/opencloudb/mpp/DataMergeService.java
Merge branch 'master' of https://github.com/opencloudb/Mycat-Server
Merge branch 'master' of https://github.com/opencloudb/Mycat-Server

Conflicts:
	src/main/java/org/opencloudb/mpp/DataMergeService.java
Merge branch 'master' of https://github.com/opencloudb/Mycat-Server

Conflicts:
	src/main/java/org/opencloudb/mpp/DataMergeService.java
在配置文件中增加sharding-murmur-hash
Merge branch 'master' of https://github.com/runfriends/Mycat-Server
Merge pull request #34 from opencloudb/master

add catlet dir
Merge pull request #35 from opencloudb/master

add logs dir
修正版本号
Merge pull request #36 from opencloudb/master

修复BUG：后端连接事件失败后，没有通知OnConnectionFailed事件，导致心跳检查异常
补充fdb和druid两种路由解析单元测试（FdbRouteStrategyTest、DruidMysqlRouteStrategyTest），原先的ServerRouteUtilTest删除
解决了连接JDBC的出现空指针的小bug
-connect error JDBCConnection [autocommit=true, txIsolation=0, running=false, borrowed=true, id=0, host=localhost, port=3306]java.lang.NullPointerException
create rehash tool, commit some spelling mistakes
Merge branch 'master' of https://github.com/sohudo/Mycat-Server
Merge pull request #40 from runfriends/master

create rehash tool, change some spelling mistakes
Merge remote-tracking branch 'trunk/master'
Conflicts:src/main/java/org/opencloudb/route/util/RouterUtil.java
PartionByDate改成PartitionByDate,否则测试用例通不过