habsi/elasticsearch-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

the default config has to change with the removal of 'script.disable_dynamic' in 2.0

Browse Source
This commit is contained in:
Spencer Alger
2015-04-01 10:21:43 -07:00
parent 79a53767e3
commit 77f73533ee
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
grunt/config/esvm.js
View File

@ -23,12 +23,23 @@ function setBranchConfig(branch, target) {
case '1.1':
// no special treatment
break;
default:
case '1.2':
case '1.3':
case '1.4':
case '1.5':
case '1.x':
target.options.config = _.merge({
'node.bench': true,
'script.disable_dynamic': false
}, target.options.config);
break;
default:
target.options.config = _.merge({
'node.bench': true,
'script.inline': true,
'script.indexed': true
}, target.options.config);
break;
}
target.options = _.merge({}, defaultOpts, target.options);

2
test/integration/yaml_suite/client_manager.js
View File

@ -1,6 +1,6 @@
var BROWSER = process.env.browser;
var VERBOSE = process.env.VERBOSE;
var JENKINS = process.env.JENKINS;
var JENKINS = !!process.env.JENKINS_HOME;
if (BROWSER) {
/* jshint browser: true */