From 12fe9171bb8d9d746035339dad716c9cdd131d9c Mon Sep 17 00:00:00 2001 From: Elastic Jasper Date: Tue, 13 Dec 2016 09:34:59 -0500 Subject: [PATCH] Bump elasticsearch client Backports PR #9446 **Commit 1:** Bump elasticsearch client * Original sha: c007b5534c446164bc82425b9041669a2a90f0d5 * Authored by Jonathan Budzenski on 2016-12-12T18:51:41Z **Commit 2:** Bump elasticsearch version in tests entry template to master * Original sha: 2419fe3e21307684998e0f3307457c985c685cd8 * Authored by Jonathan Budzenski on 2016-12-12T19:13:27Z --- package.json | 4 ++-- src/core_plugins/tests_bundle/tests_entry_template.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index d430d6413b4328..6042fdfa95449f 100644 --- a/package.json +++ b/package.json @@ -104,8 +104,8 @@ "d3": "3.5.6", "d3-cloud": "1.2.1", "dragula": "3.7.0", - "elasticsearch": "12.0.0-rc5", - "elasticsearch-browser": "12.0.0-rc5", + "elasticsearch": "12.1.2", + "elasticsearch-browser": "12.1.2", "encode-uri-query": "1.0.0", "even-better": "7.0.2", "expiry-js": "0.1.7", diff --git a/src/core_plugins/tests_bundle/tests_entry_template.js b/src/core_plugins/tests_bundle/tests_entry_template.js index 8717cc901cbd45..c41ced8bb2699a 100644 --- a/src/core_plugins/tests_bundle/tests_entry_template.js +++ b/src/core_plugins/tests_bundle/tests_entry_template.js @@ -26,7 +26,7 @@ window.__KBN__ = { vars: { kbnIndex: '.kibana', esShardTimeout: 1500, - esApiVersion: '2.0', + esApiVersion: '5.x', esRequestTimeout: '300000', tilemap: { url: 'https://tiles.elastic.co/v1/default/{z}/{x}/{y}.png?my_app_name=kibana&my_app_version=1.2.3&elastic_tile_service_tos=agree',