Merge branch 'master' of github.com:elastic/elasticsearch-js into non-poluting-promise-lib

grunt/config/esvm.js

@@ -20,6 +20,12 @@ var versionedOpts = [
       'cluster.name': 'elasticsearch_js_test_runners',
       'http.port': port,
       'network.host': host,
+      'discovery.zen.minimum_master_nodes': 1
+    }
+  },
+  {
+    version: '<3',
+    config: {
       'discovery.zen.ping.multicast.enabled': false
     }
   },
@@ -36,21 +42,32 @@ 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: '>=5.0',
+    config: {
+      'node.attr.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'
-    }
   }
 ];