github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Merge pull request #5785 from spalger/update/esClient"

Browse source 
This reverts commit ea46a77f80, reversing
changes made to 8ac55f4a1f.

Due to test failures.
This commit is contained in:
Court Ewing 2016-01-08 15:22:14 -05:00
parent ea46a77f80
commit 0f1f5b177c
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -91,7 +91,7 @@
"commander": "2.8.1",
"css-loader": "0.17.0",
"d3": "3.5.6",
"elasticsearch": "10.0.1",
"elasticsearch": "8.0.1",
"elasticsearch-browser": "8.0.1",
"expiry-js": "0.1.7",
"exports-loader": "0.6.2",

2
src/plugins/elasticsearch/index.js
View file

@ -23,7 +23,7 @@ module.exports = function (kibana) {
cert: Joi.string(),
key: Joi.string()
}).default(),
apiVersion: Joi.string().default('2.1'),
apiVersion: Joi.string().default('2.0'),
engineVersion: Joi.string().valid('^2.1.0').default('^2.1.0')
}).default();
},

2
src/plugins/elasticsearch/lib/health_check.js
View file

@ -65,7 +65,7 @@ module.exports = function (plugin, server) {
if (timeoutId) return;
var myId = setTimeout(function () {
Promise.try(check).finally(function () {
check().finally(function () {
if (timeoutId === myId) startorRestartChecking();
});
}, ms);