From 531f55a23e416965e6a50b4c7667e8e8ab9d44b2 Mon Sep 17 00:00:00 2001 From: toutdesuite Date: Mon, 27 Jul 2020 17:03:05 +0800 Subject: [PATCH 1/2] cherry pick #184 to release-1.0 Signed-off-by: ti-srebot --- en/task-configuration-file-full.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/en/task-configuration-file-full.md b/en/task-configuration-file-full.md index 7a763b3e8..2ea0c0160 100644 --- a/en/task-configuration-file-full.md +++ b/en/task-configuration-file-full.md @@ -30,7 +30,11 @@ meta-schema: "dm_meta" # The downstream database that stores the `meta` remove-meta: false # Whether to remove the `meta` information (`checkpoint` and `onlineddl`) corresponding to the task name before starting the replication task. enable-heartbeat: false # Whether to enable the heartbeat feature. online-ddl-scheme: "gh-ost" # Only "gh-ost" and "pt" are currently supported. +<<<<<<< HEAD case-sensitive: false # Whether schema/table is case-sensitive. +======= +clean-dump-file: true # Whether to clean up the files generated during data dump. Note that these include `metadata` files. +>>>>>>> 794c5cd... Update task-configuration-file-full.md (#184) target-database: # Configuration of the downstream database instance. host: "192.168.0.1" From 4c1c26333830620dddb2371a48c298bd8b571508 Mon Sep 17 00:00:00 2001 From: toutdesuite Date: Mon, 27 Jul 2020 19:08:26 +0800 Subject: [PATCH 2/2] Update task-configuration-file-full.md --- en/task-configuration-file-full.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/en/task-configuration-file-full.md b/en/task-configuration-file-full.md index 2ea0c0160..0e39b5b86 100644 --- a/en/task-configuration-file-full.md +++ b/en/task-configuration-file-full.md @@ -30,11 +30,8 @@ meta-schema: "dm_meta" # The downstream database that stores the `meta` remove-meta: false # Whether to remove the `meta` information (`checkpoint` and `onlineddl`) corresponding to the task name before starting the replication task. enable-heartbeat: false # Whether to enable the heartbeat feature. online-ddl-scheme: "gh-ost" # Only "gh-ost" and "pt" are currently supported. -<<<<<<< HEAD case-sensitive: false # Whether schema/table is case-sensitive. -======= -clean-dump-file: true # Whether to clean up the files generated during data dump. Note that these include `metadata` files. ->>>>>>> 794c5cd... Update task-configuration-file-full.md (#184) +clean-dump-file: true # Whether to clean up the files generated during data dump. Note that these include `metadata` files. New in v1.0.7. target-database: # Configuration of the downstream database instance. host: "192.168.0.1"