machey 4fe6c36c49 Merge branch 'develop-tmp' ...

# Conflicts:
#	kafka-client/pom.xml
#	kafka/pom.xml

2018-08-23 23:59:20 +08:00

..

main/java/com/alibaba/otter/canal

Merge branch 'develop-tmp'

2018-08-23 23:59:20 +08:00

test/java/com/alibaba/otter/canal/server

instance由manager管理时，CanalParameter#MetaMode增加本地文件方式，本地meta.dat存储位点信息；

2018-08-05 19:40:14 +08:00