From 37544399cea4f8f4e14d881470c7edbc084a257a Mon Sep 17 00:00:00 2001 From: delvedor Date: Fri, 26 Apr 2019 15:03:20 +0200 Subject: [PATCH] API generation --- api/api/indices.put_mapping.js | 10 ---------- api/api/nodes.hot_threads.js | 5 ----- 2 files changed, 15 deletions(-) diff --git a/api/api/indices.put_mapping.js b/api/api/indices.put_mapping.js index da848cfb1..491ffd2db 100644 --- a/api/api/indices.put_mapping.js +++ b/api/api/indices.put_mapping.js @@ -111,7 +111,6 @@ function buildIndicesPutMapping (opts) { } else if ((index) != null && (type) != null) { path = '/' + encodeURIComponent(index) + '/' + '_mappings' + '/' + encodeURIComponent(type) } else if ((type) != null) { -<<<<<<< HEAD path = '/' + '_mapping' + '/' + encodeURIComponent(type) } else if ((type) != null) { path = '/' + '_mappings' + '/' + encodeURIComponent(type) @@ -119,15 +118,6 @@ function buildIndicesPutMapping (opts) { path = '/' + encodeURIComponent(index) + '/' + '_mappings' } else { path = '/' + encodeURIComponent(index) + '/' + '_mapping' -======= - path = '/' + '_mappings' + '/' + encodeURIComponent(type) - } else if ((type) != null) { - path = '/' + '_mapping' + '/' + encodeURIComponent(type) - } else if ((index) != null) { - path = '/' + encodeURIComponent(index) + '/' + '_mapping' - } else { - path = '/' + encodeURIComponent(index) + '/' + '_mappings' ->>>>>>> 349b832... Support for deprecated paths (#828) } // build request object diff --git a/api/api/nodes.hot_threads.js b/api/api/nodes.hot_threads.js index fdb0f4cae..12f59399c 100644 --- a/api/api/nodes.hot_threads.js +++ b/api/api/nodes.hot_threads.js @@ -101,14 +101,9 @@ function buildNodesHotThreads (opts) { } else if ((node_id || nodeId) != null) { path = '/' + '_cluster' + '/' + 'nodes' + '/' + encodeURIComponent(node_id || nodeId) + '/' + 'hot_threads' } else if ((node_id || nodeId) != null) { -<<<<<<< HEAD path = '/' + '_nodes' + '/' + encodeURIComponent(node_id || nodeId) + '/' + 'hotthreads' } else if ((node_id || nodeId) != null) { -======= ->>>>>>> 349b832... Support for deprecated paths (#828) path = '/' + '_nodes' + '/' + encodeURIComponent(node_id || nodeId) + '/' + 'hot_threads' - } else if ((node_id || nodeId) != null) { - path = '/' + '_nodes' + '/' + encodeURIComponent(node_id || nodeId) + '/' + 'hotthreads' } else { path = '/' + '_cluster' + '/' + 'nodes' + '/' + 'hotthreads' }