Skip to content

Commit 7b1f726

Browse files
Tyler SmalleySpencer
authored andcommitted
Update branches to include 6.8 and 7.1 (#2)
Signed-off-by: Tyler Smalley <[email protected]>
1 parent 7443cf5 commit 7b1f726

File tree

15 files changed

+25982
-1233
lines changed

15 files changed

+25982
-1233
lines changed

docs/api_methods.asciidoc

Lines changed: 215 additions & 193 deletions
Large diffs are not rendered by default.

docs/api_methods_6_6.asciidoc

Lines changed: 5302 additions & 0 deletions
Large diffs are not rendered by default.

docs/api_methods_7_0.asciidoc

Lines changed: 5314 additions & 0 deletions
Large diffs are not rendered by default.

docs/configuration.asciidoc

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,11 @@ Default in Node:::
5252
+
5353
WARNING: This default will track the latest version of Elasticsearch, and is only intended to be used during development. It is highly recommended that you set this parameter in all code that is headed to production.
5454

55-
Default ::: `'6.6'`
55+
Default ::: `'6.7'`
5656

5757
Options in node :::
58+
* `'7.0'`
59+
* `'6.7'`
5860
* `'6.6'`
5961
* `'6.5'`
6062
* `'6.4'`
@@ -66,19 +68,19 @@ Options in node :::
6668
* `'2.4'`
6769
* `'1.7'`
6870
* `'0.90'`
69-
* `'6.7'` (unstable)
70-
* `'7.0'` (unstable)
71+
* `'6.8'` (unstable)
72+
* `'7.1'` (unstable)
7173
* `'7.x'` (unstable)
7274
* `'master'` (unstable)
7375

7476
Options in the browser :::
77+
* `'7.0'`
78+
* `'6.7'`
7579
* `'6.6'`
7680
* `'6.5'`
7781
* `'6.4'`
78-
* `'6.3'`
79-
* `'6.2'`
80-
* `'6.7'` (unstable)
81-
* `'7.0'` (unstable)
82+
* `'6.8'` (unstable)
83+
* `'7.1'` (unstable)
8284
* `'7.x'` (unstable)
8385
* `'master'` (unstable)
8486

docs/index.asciidoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@ include::logging.asciidoc[]
2020

2121
include::development.asciidoc[]
2222

23+
include::api_methods_7_0.asciidoc[]
24+
2325
include::api_methods.asciidoc[]
2426

27+
include::api_methods_6_6.asciidoc[]
28+
2529
include::api_methods_6_5.asciidoc[]
2630

2731
include::api_methods_6_4.asciidoc[]

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@
2929
"blanket": {
3030
"pattern": "specified in test/unit/coverage.js"
3131
},
32-
"default_api_branch": "6.6",
32+
"default_api_branch": "6.7",
3333
"supported_es_branches": [
34+
"7.0",
35+
"6.7",
3436
"6.6",
3537
"6.5",
3638
"6.4",
@@ -44,8 +46,8 @@
4446
"0.90"
4547
],
4648
"unstable_es_branches": [
47-
"6.7",
48-
"7.0",
49+
"6.8",
50+
"7.1",
4951
"7.x",
5052
"master"
5153
]

scripts/generate/js_api.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,10 @@ module.exports = function (branch, done) {
201201
def.documentation = 'http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cat.html';
202202
}
203203

204-
def.documentation = def.documentation.replace(
204+
def.documentation = def.documentation ? def.documentation.replace(
205205
/^https?:\/\/.+?\/guide\/en\/elasticsearch\/(.+?)\/.+?\//,
206206
`https://www.elastic.co/guide/en/elasticsearch/$1/${branch}/`
207-
);
207+
) : '';
208208

209209
var steps = name.split('.');
210210

src/lib/apis/6_7.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4870,7 +4870,7 @@ api.info = ca({
48704870
api.ingest = namespace();
48714871

48724872
/**
4873-
* Perform a [ingest.deletePipeline](https://www.elastic.co/guide/en/elasticsearch/plugins/6.7/ingest.html) request
4873+
* Perform a [ingest.deletePipeline](https://www.elastic.co/guide/en/elasticsearch/reference/6.7/delete-pipeline-api.html) request
48744874
*
48754875
* @param {Object} params - An object with parameters used to carry out this action
48764876
* @param {<<api-param-type-duration-string,`DurationString`>>} params.masterTimeout - Explicit operation timeout for connection to master node
@@ -4899,7 +4899,7 @@ api.ingest.prototype.deletePipeline = ca({
48994899
});
49004900

49014901
/**
4902-
* Perform a [ingest.getPipeline](https://www.elastic.co/guide/en/elasticsearch/plugins/6.7/ingest.html) request
4902+
* Perform a [ingest.getPipeline](https://www.elastic.co/guide/en/elasticsearch/reference/6.7/get-pipeline-api.html) request
49034903
*
49044904
* @param {Object} params - An object with parameters used to carry out this action
49054905
* @param {<<api-param-type-duration-string,`DurationString`>>} params.masterTimeout - Explicit operation timeout for connection to master node
@@ -4928,7 +4928,7 @@ api.ingest.prototype.getPipeline = ca({
49284928
});
49294929

49304930
/**
4931-
* Perform a [ingest.processorGrok](https://www.elastic.co/guide/en/elasticsearch/plugins/6.7/ingest.html) request
4931+
* Perform a [ingest.processorGrok](https://www.elastic.co/guide/en/elasticsearch/reference/6.7/grok-processor.html#grok-processor-rest-get) request
49324932
*
49334933
* @param {Object} params - An object with parameters used to carry out this action
49344934
*/
@@ -4939,7 +4939,7 @@ api.ingest.prototype.processorGrok = ca({
49394939
});
49404940

49414941
/**
4942-
* Perform a [ingest.putPipeline](https://www.elastic.co/guide/en/elasticsearch/plugins/6.7/ingest.html) request
4942+
* Perform a [ingest.putPipeline](https://www.elastic.co/guide/en/elasticsearch/reference/6.7/put-pipeline-api.html) request
49434943
*
49444944
* @param {Object} params - An object with parameters used to carry out this action
49454945
* @param {<<api-param-type-duration-string,`DurationString`>>} params.masterTimeout - Explicit operation timeout for connection to master node
@@ -4969,7 +4969,7 @@ api.ingest.prototype.putPipeline = ca({
49694969
});
49704970

49714971
/**
4972-
* Perform a [ingest.simulate](https://www.elastic.co/guide/en/elasticsearch/plugins/6.7/ingest.html) request
4972+
* Perform a [ingest.simulate](https://www.elastic.co/guide/en/elasticsearch/reference/6.7/simulate-pipeline-api.html) request
49734973
*
49744974
* @param {Object} params - An object with parameters used to carry out this action
49754975
* @param {<<api-param-type-boolean,`Boolean`>>} params.verbose - Verbose mode. Display data output for each processor in executed pipeline

0 commit comments

Comments
 (0)