[esvm] update config to work for master

This commit is contained in:
spalger
2016-03-30 12:10:21 -07:00
parent 6714ae55c6
commit 5b0be45cb9
2 changed files with 13 additions and 8 deletions

View File

@ -42,21 +42,26 @@ var versionedOpts = [
'script.disable_dynamic': false
}
},
{
version: '>=1.6 <5.0',
config: {
'node.bench': true
}
},
{
version: '>2.0 <5.0',
config: {
'node.testattr': 'test'
}
},
{
version: '>=1.6',
config: {
'node.bench': true,
'script.inline': true,
'script.indexed': true,
'path.repo': process.env.ES_PATH_REPO || fromRoot('.es-snapshot-repos'),
'repositories.url.allowed_urls': 'http://snapshot.*'
}
},
{
version: '>2.0',
config: {
'node.testattr': 'test'
}
}
];

View File

@ -19,7 +19,7 @@ Version.fromBranch = function (branch) {
var m;
// master === the highest version number
if (branch === 'master') return new Version('3.0.0');
if (branch === 'master') return new Version('5.0.0');
// n.m -> n.m.0
if (m = branch.match(/^\d+\.\d+$/)) return new Version(branch + '.0');