From 5b0be45cb9171853c9bd6c982bf94fd771efaffa Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Wed, 30 Mar 2016 12:10:21 -0700
Subject: [PATCH] [esvm] update config to work for master

---
 grunt/config/esvm.js | 19 ++++++++++++-------
 scripts/Version.js   |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/grunt/config/esvm.js b/grunt/config/esvm.js
index efd5d3c28..4002bbefb 100644
--- a/grunt/config/esvm.js
+++ b/grunt/config/esvm.js
@@ -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'
-    }
   }
 ];
 
diff --git a/scripts/Version.js b/scripts/Version.js
index 27ab596db..93efcd599 100644
--- a/scripts/Version.js
+++ b/scripts/Version.js
@@ -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');