From ceba973080f9f6676df949acb5b61f65fb9df9c8 Mon Sep 17 00:00:00 2001 From: gccgdb1234 Date: Fri, 26 Aug 2022 19:04:04 +0800 Subject: [PATCH] doc: resolve conflicts --- docs/en/10-deployment/01-deploy.md | 6 ++---- docs/zh/10-deployment/01-deploy.md | 4 ---- docs/zh/14-reference/11-docker/index.md | 10 ---------- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/docs/en/10-deployment/01-deploy.md b/docs/en/10-deployment/01-deploy.md index 477e618a45..a445b684dc 100644 --- a/docs/en/10-deployment/01-deploy.md +++ b/docs/en/10-deployment/01-deploy.md @@ -114,11 +114,9 @@ The above process can be repeated to add more dnodes in the cluster. Any node that is in the cluster and online can be the firstEp of new nodes. Nodes use the firstEp parameter only when joining a cluster for the first time. After a node has joined the cluster, it stores the latest mnode in its end point list and no longer makes use of firstEp. -<<<<<<< HEAD + However, firstEp is used by clients that connect to the cluster. For example, if you run TDengine CLI `taos` without arguments, it connects to the firstEp by default. -======= -However, firstEp is used by clients that connect to the cluster. For example, if you run `TDengine CLI` without arguments, it connects to the firstEp by default. ->>>>>>> 30903ba80fe488b3b8e96db7f599052a05f7c025 + Two dnodes that are launched without a firstEp value operate independently of each other. It is not possible to add one dnode to the other dnode and form a cluster. It is also not possible to form two independent clusters into a new cluster. ::: diff --git a/docs/zh/10-deployment/01-deploy.md b/docs/zh/10-deployment/01-deploy.md index c5f63cc636..03b4ce30f9 100644 --- a/docs/zh/10-deployment/01-deploy.md +++ b/docs/zh/10-deployment/01-deploy.md @@ -71,11 +71,7 @@ serverPort 6030 ## 启动集群 -<<<<<<< HEAD 按照《立即开始》里的步骤，启动第一个数据节点，例如 h1.taosdata.com，然后执行 taos，启动 TDengine CLI，在其中执行命令 “SHOW DNODES”，如下所示： -======= -按照《立即开始》里的步骤，启动第一个数据节点，例如 h1.taosdata.com，然后执行 taos，启动 TDengine CLI，从 shell 里执行命令“SHOW DNODES”，如下所示： ->>>>>>> 30903ba80fe488b3b8e96db7f599052a05f7c025 ``` taos> show dnodes; diff --git a/docs/zh/14-reference/11-docker/index.md b/docs/zh/14-reference/11-docker/index.md index 1655817635..d712e9aba8 100644 --- a/docs/zh/14-reference/11-docker/index.md +++ b/docs/zh/14-reference/11-docker/index.md @@ -32,13 +32,7 @@ taos> show databases; Query OK, 2 rows in database (0.033802s) ``` -<<<<<<< HEAD 因为运行在容器中的 TDengine 服务端使用容器的 hostname 建立连接，使用 TDengine CLI 或者各种连接器（例如 JDBC-JNI）从容器外访问容器内的 TDengine 比较复杂，所以上述方式是访问容器中 TDengine 服务的最简单的方法，适用于一些简单场景。如果在一些复杂场景下想要从容器化使用 TDengine CLI 或者各种连接器访问容器中的 TDengine 服务，请参考下一节。 -======= - -因为运行在容器中的 TDengine 服务端使用容器的 hostname 建立连接，使用 TDengine CLI 或者各种连接器（例如 JDBC-JNI）从容器外访问容器内的 TDengine 比较复杂，所以上述方式是访问容器中 TDengine 服务的最简单的方法，适用于一些简单场景。如果在一些复杂场景下想要从容器化使用 TDengine CLI 或者各种连接器访问容器中的 TDengine 服务，请参考下一节。 - ->>>>>>> 30903ba80fe488b3b8e96db7f599052a05f7c025 ## 在 host 网络上启动 TDengine @@ -360,11 +354,7 @@ test-docker_td-2_1 /tini -- /usr/bin/entrypoi ... Up test-docker_td-3_1 /tini -- /usr/bin/entrypoi ... Up ``` -<<<<<<< HEAD -4. 用 TDengine 查看 dnodes -======= 4. 用 TDengine CLI 查看 dnodes ->>>>>>> 30903ba80fe488b3b8e96db7f599052a05f7c025 ```shell