From 4a028954ffd8124a663a1dda47e43037f275e415 Mon Sep 17 00:00:00 2001 From: David Turner Date: Thu, 2 Jan 2020 15:26:32 +0000 Subject: [PATCH 1/4] Remove included docs In #50499 we accidentally duplicated the docs for the `?local` parameter to the `GET _cat/nodes` API. This commit removes the duplicate docs. --- docs/reference/cat/nodes.asciidoc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/reference/cat/nodes.asciidoc b/docs/reference/cat/nodes.asciidoc index 950a7da78b861..5f417cb605339 100644 --- a/docs/reference/cat/nodes.asciidoc +++ b/docs/reference/cat/nodes.asciidoc @@ -285,9 +285,6 @@ Number of suggest operations, such as `0`. include::{docdir}/rest-api/common-parms.asciidoc[tag=help] -include::{docdir}/rest-api/common-parms.asciidoc[tag=local] -+ --- `local`:: (Optional, boolean) If `true`, the request computes the list of selected nodes from the local cluster state. Defaults to `false`, which means the list of @@ -295,7 +292,6 @@ selected nodes is computed from the cluster state on the master node. In either case the coordinating node sends a request for further information to each selected node. deprecated::[7.6,This parameter does not cause this API to act locally. It will be removed in version 8.0.] --- include::{docdir}/rest-api/common-parms.asciidoc[tag=master-timeout] From d236bc670ac2e1ae94aee23caa925c6121bde739 Mon Sep 17 00:00:00 2001 From: David Turner Date: Thu, 2 Jan 2020 15:38:23 +0000 Subject: [PATCH 2/4] fix deprecation annotation --- docs/reference/cat/nodes.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/cat/nodes.asciidoc b/docs/reference/cat/nodes.asciidoc index 5f417cb605339..7e87981c0b1de 100644 --- a/docs/reference/cat/nodes.asciidoc +++ b/docs/reference/cat/nodes.asciidoc @@ -290,7 +290,7 @@ include::{docdir}/rest-api/common-parms.asciidoc[tag=help] from the local cluster state. Defaults to `false`, which means the list of selected nodes is computed from the cluster state on the master node. In either case the coordinating node sends a request for further information to each -selected node. deprecated::[7.6,This parameter does not cause this API to act +selected node. deprecated:[7.6,This parameter does not cause this API to act locally. It will be removed in version 8.0.] include::{docdir}/rest-api/common-parms.asciidoc[tag=master-timeout] From 59e54fe60871841a7abda71791b558e7a7d1d1c5 Mon Sep 17 00:00:00 2001 From: David Turner Date: Thu, 2 Jan 2020 15:48:34 +0000 Subject: [PATCH 3/4] Moar fix --- docs/reference/cat/nodes.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/cat/nodes.asciidoc b/docs/reference/cat/nodes.asciidoc index 7e87981c0b1de..fdc96d91a9b68 100644 --- a/docs/reference/cat/nodes.asciidoc +++ b/docs/reference/cat/nodes.asciidoc @@ -290,7 +290,7 @@ include::{docdir}/rest-api/common-parms.asciidoc[tag=help] from the local cluster state. Defaults to `false`, which means the list of selected nodes is computed from the cluster state on the master node. In either case the coordinating node sends a request for further information to each -selected node. deprecated:[7.6,This parameter does not cause this API to act +selected node. deprecated:[7.6.0,This parameter does not cause this API to act locally. It will be removed in version 8.0.] include::{docdir}/rest-api/common-parms.asciidoc[tag=master-timeout] From b51b321ca996fe5f3de26a0321793f3cdf10afc1 Mon Sep 17 00:00:00 2001 From: David Turner Date: Thu, 2 Jan 2020 15:57:48 +0000 Subject: [PATCH 4/4] Moar fix --- docs/reference/cat/nodes.asciidoc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/reference/cat/nodes.asciidoc b/docs/reference/cat/nodes.asciidoc index fdc96d91a9b68..a0e046548da80 100644 --- a/docs/reference/cat/nodes.asciidoc +++ b/docs/reference/cat/nodes.asciidoc @@ -286,12 +286,13 @@ Number of suggest operations, such as `0`. include::{docdir}/rest-api/common-parms.asciidoc[tag=help] `local`:: -(Optional, boolean) If `true`, the request computes the list of selected nodes -from the local cluster state. Defaults to `false`, which means the list of -selected nodes is computed from the cluster state on the master node. In either -case the coordinating node sends a request for further information to each -selected node. deprecated:[7.6.0,This parameter does not cause this API to act -locally. It will be removed in version 8.0.] +(Optional, boolean) +deprecated:[7.6.0,This parameter does not cause this API to act locally. It will be removed in version 8.0.] +If `true`, the request computes the list of selected nodes from the local +cluster state. Defaults to `false`, which means the list of selected nodes is +computed from the cluster state on the master node. In either case the +coordinating node sends a request for further information to each selected +node. include::{docdir}/rest-api/common-parms.asciidoc[tag=master-timeout]