Merge branch 'master' into master

This commit is contained in:
rewerma
2019-07-14 19:24:42 +08:00
committed by GitHub
181 changed files with 23177 additions and 49 deletions

View File

@@ -8,6 +8,7 @@ canal.id = 1
canal.ip =
canal.port = 11111
canal.metrics.pull.port = 11112
canal.admin.jmx.port = 11113
canal.zkServers =
# flush data to zk
canal.zookeeper.flush.period = 1000
@@ -127,4 +128,4 @@ canal.mq.accessChannel = local
##################################################
canal.mq.kafka.kerberos.enable = false
canal.mq.kafka.kerberos.krb5FilePath = "../conf/kerberos/krb5.conf"
canal.mq.kafka.kerberos.jaasFilePath = "../conf/kerberos/jaas.conf"
canal.mq.kafka.kerberos.jaasFilePath = "../conf/kerberos/jaas.conf"