mcy aba8df699c Merge branch 'master' into feature/es2 ...

# Conflicts:
#	client-adapter/elasticsearch/src/main/java/com/alibaba/otter/canal/client/adapter/es/config/SchemaItem.java

2019-02-12 17:21:42 +08:00

..

src

Merge branch 'master' into feature/es2

2019-02-12 17:21:42 +08:00

pom.xml

修改yml配置读取绑定，遵循spring yml加载方式，支持environment级占位符替换

2019-02-01 10:11:52 +08:00