From 6c9f22f362397156d9896393eb172bb083fd901c Mon Sep 17 00:00:00 2001 From: Jack20 <66831345+Jacksx20@users.noreply.github.com> Date: Wed, 5 Feb 2025 15:34:15 +0800 Subject: [PATCH 01/12] Update v1.32.0-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md --- ...binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/v1.32.0-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md b/doc/v1.32.0-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md index 0a48500..65637f1 100644 --- a/doc/v1.32.0-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md +++ b/doc/v1.32.0-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md @@ -3270,7 +3270,7 @@ etcdctl --endpoints="192.168.1.33:2379,192.168.1.32:2379,192.168.1.31:2379" --ca # 5.高可用配置（在Master服务器上操作） -**注意* 5.1.1 和5.1.2 二选一即可** +**注意* 5.1 和5.1 二选一即可** 选择使用那种高可用方案，同时可以俩种都选用，实现内外兼顾的效果，比如： 5.1 的 NGINX方案实现集群内的高可用 From 2e4828b7f2aeef44d4c536acb2f6fce750f1e45e Mon Sep 17 00:00:00 2001 From: Jack20 <66831345+Jacksx20@users.noreply.github.com> Date: Wed, 5 Feb 2025 19:30:01 +0800 Subject: [PATCH 02/12] Update v1.31.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md --- ...binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/v1.31.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md b/doc/v1.31.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md index 519a97d..ea63184 100644 --- a/doc/v1.31.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md +++ b/doc/v1.31.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md @@ -3197,7 +3197,7 @@ etcdctl --endpoints="192.168.1.33:2379,192.168.1.32:2379,192.168.1.31:2379" --ca # 5.高可用配置（在Master服务器上操作） -**注意* 5.1.1 和5.1.2 二选一即可** +**注意* 5.1 和5.2 二选一即可** 选择使用那种高可用方案，同时可以俩种都选用，实现内外兼顾的效果，比如： 5.1 的 NGINX方案实现集群内的高可用 From e810e7d61e68b255bafc47c81615da2fa20d2cd6 Mon Sep 17 00:00:00 2001 From: Jack20 <66831345+Jacksx20@users.noreply.github.com> Date: Wed, 5 Feb 2025 19:30:24 +0800 Subject: [PATCH 03/12] Update v1.30.2-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md --- ...binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/v1.30.2-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md b/doc/v1.30.2-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md index 4e0127e..b4aba68 100644 --- a/doc/v1.30.2-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md +++ b/doc/v1.30.2-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md @@ -3210,7 +3210,7 @@ etcdctl --endpoints="192.168.1.43:2379,192.168.1.42:2379,192.168.1.41:2379" --ca # 5.高可用配置（在Master服务器上操作） -**注意* 5.1.1 和5.1.2 二选一即可** +**注意* 5.1 和5.2 二选一即可** 选择使用那种高可用方案，同时可以俩种都选用，实现内外兼顾的效果，比如： 5.1 的 NGINX方案实现集群内的高可用 From 8e2a5a17bcccce9922ed4c7979e0b58fa4f0dd9c Mon Sep 17 00:00:00 2001 From: Jack20 <66831345+Jacksx20@users.noreply.github.com> Date: Wed, 5 Feb 2025 19:30:43 +0800 Subject: [PATCH 04/12] Update v1.30.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md --- ...binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/v1.30.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md b/doc/v1.30.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md index ec5460b..542821a 100644 --- a/doc/v1.30.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md +++ b/doc/v1.30.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md @@ -3218,7 +3218,7 @@ etcdctl --endpoints="192.168.1.43:2379,192.168.1.42:2379,192.168.1.41:2379" --ca # 5.高可用配置（在Master服务器上操作） -**注意* 5.1.1 和5.1.2 二选一即可** +**注意* 5.1 和5.2 二选一即可** 选择使用那种高可用方案，同时可以俩种都选用，实现内外兼顾的效果，比如： 5.1 的 NGINX方案实现集群内的高可用 From a31105839bb33718e73c85d48e29c9195a8a8343 Mon Sep 17 00:00:00 2001 From: Jack20 <66831345+Jacksx20@users.noreply.github.com> Date: Wed, 5 Feb 2025 19:31:05 +0800 Subject: [PATCH 05/12] Update v1.29.2-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md --- ...binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/v1.29.2-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md b/doc/v1.29.2-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md index f3ee96d..9dc96e3 100644 --- a/doc/v1.29.2-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md +++ b/doc/v1.29.2-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md @@ -2963,7 +2963,7 @@ etcdctl --endpoints="192.168.1.33:2379,192.168.1.32:2379,192.168.1.31:2379" --ca # 5.高可用配置（在Master服务器上操作） -**注意* 5.1.1 和5.1.2 二选一即可** +**注意* 5.1 和5.2 二选一即可** 选择使用那种高可用方案，同时可以俩种都选用，实现内外兼顾的效果，比如： 5.1 的 NGINX方案实现集群内的高可用 From dc897098763f17b98011d23bd79f01eb5bbb6ca6 Mon Sep 17 00:00:00 2001 From: Jack20 <66831345+Jacksx20@users.noreply.github.com> Date: Wed, 5 Feb 2025 19:31:26 +0800 Subject: [PATCH 06/12] Update v1.28.3-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md --- ...binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/v1.28.3-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md b/doc/v1.28.3-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md index 9fa5cde..d09991e 100644 --- a/doc/v1.28.3-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md +++ b/doc/v1.28.3-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md @@ -2969,7 +2969,7 @@ etcdctl --endpoints="192.168.1.33:2379,192.168.1.32:2379,192.168.1.31:2379" --ca # 5.高可用配置（在Master服务器上操作） -**注意* 5.1.1 和5.1.2 二选一即可** +**注意* 5.1 和5.2 二选一即可** 选择使用那种高可用方案，同时可以俩种都选用，实现内外兼顾的效果，比如： 5.1 的 NGINX方案实现集群内的高可用 From 0612160059ef1a395f8acb4ce02d7c035f5a881c Mon Sep 17 00:00:00 2001 From: Jack20 <66831345+Jacksx20@users.noreply.github.com> Date: Wed, 5 Feb 2025 19:31:51 +0800 Subject: [PATCH 07/12] Update v1.28.0-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md --- ...binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/v1.28.0-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md b/doc/v1.28.0-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md index fde45ff..58a16d4 100644 --- a/doc/v1.28.0-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md +++ b/doc/v1.28.0-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md @@ -2979,7 +2979,7 @@ etcdctl --endpoints="192.168.0.33:2379,192.168.0.32:2379,192.168.0.31:2379" --ca # 5.高可用配置（在Master服务器上操作） -**注意* 5.1.1 和5.1.2 二选一即可** +**注意* 5.1 和5.2 二选一即可** 选择使用那种高可用方案，同时可以俩种都选用，实现内外兼顾的效果，比如： 5.1 的 NGINX方案实现集群内的高可用 From 24f92a5b882b2605dd53639a56b3ba7b684525aa Mon Sep 17 00:00:00 2001 From: Jack20 <66831345+Jacksx20@users.noreply.github.com> Date: Wed, 5 Feb 2025 19:32:11 +0800 Subject: [PATCH 08/12] Update v1.27.3-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md --- ...binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/v1.27.3-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md b/doc/v1.27.3-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md index 1841546..f329d67 100644 --- a/doc/v1.27.3-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md +++ b/doc/v1.27.3-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md @@ -1537,7 +1537,7 @@ etcdctl --endpoints="192.168.0.33:2379,192.168.0.32:2379,192.168.0.31:2379" --ca # 5.高可用配置（在Master服务器上操作） -**注意* 5.1.1 和5.1.2 二选一即可** +**注意* 5.1 和5.2 二选一即可** 选择使用那种高可用方案，同时可以俩种都选用，实现内外兼顾的效果，比如： 5.1 的 NGINX方案实现集群内的高可用 From 348a6a8b132a4e340bcddb94c83a9ffa057b0fb0 Mon Sep 17 00:00:00 2001 From: Jack20 <66831345+Jacksx20@users.noreply.github.com> Date: Wed, 5 Feb 2025 19:32:30 +0800 Subject: [PATCH 09/12] Update v1.27.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md --- ...binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/v1.27.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md b/doc/v1.27.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md index f89ca5e..d7322aa 100644 --- a/doc/v1.27.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md +++ b/doc/v1.27.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md @@ -2250,7 +2250,7 @@ etcdctl --endpoints="192.168.0.33:2379,192.168.0.32:2379,192.168.0.31:2379" --ca # 5.高可用配置（在Master服务器上操作） -**注意* 5.1.1 和5.1.2 二选一即可** +**注意* 5.1 和5.2 二选一即可** 选择使用那种高可用方案 From 74e22fde8444a8e6efbf1804458233cd707da3e1 Mon Sep 17 00:00:00 2001 From: Jack20 <66831345+Jacksx20@users.noreply.github.com> Date: Wed, 5 Feb 2025 19:32:49 +0800 Subject: [PATCH 10/12] Update v1.26.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md --- ...binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/v1.26.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md b/doc/v1.26.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md index b4726f6..3ae240c 100644 --- a/doc/v1.26.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md +++ b/doc/v1.26.1-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves-Offline.md @@ -2284,7 +2284,7 @@ etcdctl --endpoints="3.7.191.63:2379,3.7.191.62:2379,3.7.191.61:2379" --cacert=/ # 5.高可用配置（在Master服务器上操作） -**注意* 5.1.1 和5.1.2 二选一即可** +**注意* 5.1 和5.2 二选一即可** 选择使用那种高可用方案 From db89f97f327efd0d729de510e28ff21eebd3c7e5 Mon Sep 17 00:00:00 2001 From: Jack20 <66831345+Jacksx20@users.noreply.github.com> Date: Wed, 5 Feb 2025 19:33:07 +0800 Subject: [PATCH 11/12] Update v1.26.0-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves.md --- ...-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/v1.26.0-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves.md b/doc/v1.26.0-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves.md index 7ab6d5c..56fbd96 100644 --- a/doc/v1.26.0-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves.md +++ b/doc/v1.26.0-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves.md @@ -2041,7 +2041,7 @@ etcdctl --endpoints="192.168.1.63:2379,192.168.1.62:2379,192.168.1.61:2379" --ca # 5.高可用配置（在Master服务器上操作） -**注意* 5.1.1 和5.1.2 二选一即可** +**注意* 5.1 和5.2 二选一即可** 选择使用那种高可用方案 From 26199890020b6ac7737d84e2e13f6dd03277151b Mon Sep 17 00:00:00 2001 From: Jack20 <66831345+Jacksx20@users.noreply.github.com> Date: Wed, 5 Feb 2025 19:33:24 +0800 Subject: [PATCH 12/12] Update v1.25.4-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves.md --- ...-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/v1.25.4-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves.md b/doc/v1.25.4-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves.md index 05964b5..536c24d 100644 --- a/doc/v1.25.4-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves.md +++ b/doc/v1.25.4-CentOS-binary-install-IPv6-IPv4-Three-Masters-Two-Slaves.md @@ -2034,7 +2034,7 @@ etcdctl --endpoints="192.168.8.63:2379,192.168.8.62:2379,192.168.8.61:2379" --ca # 5.高可用配置（在Master服务器上操作） -**注意* 5.1.1 和5.1.2 二选一即可** +**注意* 5.1 和5.2 二选一即可** 选择使用那种高可用方案