diff options
| author | luwenpeng <[email protected]> | 2019-12-24 13:49:21 +0800 |
|---|---|---|
| committer | luwenpeng <[email protected]> | 2019-12-24 13:49:21 +0800 |
| commit | ffcac0c94c428377ade24f8532ce4fc443311400 (patch) | |
| tree | 70e9cdd97fdd9e5d2203c383871d344cc1fd44a3 /conf | |
| parent | 8e58380a8a7939c1dcd43d2cfb8b4ccbb6aa0167 (diff) | |
| parent | a3856d20e7f702b74de5173ecf23538eadd0184a (diff) | |
merged 冲突
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/tfe/tfe.conf | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/conf/tfe/tfe.conf b/conf/tfe/tfe.conf index 0c429ec..4d02e87 100644 --- a/conf/tfe/tfe.conf +++ b/conf/tfe/tfe.conf @@ -29,9 +29,15 @@ mc_cache_enable=1 # default eth0 mc_cache_eth=eth0 # default NULL +<<<<<<< HEAD mc_cache_broker_list=192.168.40.224:9092 # default PXY-EXCH-INTERMEDIA-CERT mc_cache_topic=PXY-EXCH-INTERMEDIA-CERT +======= +mc_cache_broker_list= +# default MID-CERT-CACHE-LOG +mc_cache_topic=MID-CERT-CACHE-LOG +>>>>>>> a3856d20e7f702b74de5173ecf23538eadd0184a [key_keeper] #Mode: debug - generate cert with ca_path, normal - generate cert with cert store |