Merge branch 'feature/5.4.0'

elastic · May 5, 2017 · 30c0832 · 30c0832
2 parents ffea13e + de9d3db
commit 30c0832
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/build/allowedValues.json b/build/allowedValues.json
@@ -26,6 +26,9 @@
     },
     "5.3.2": {
       "kibana": "5.3.2"
+    },
+    "5.4.0": {
+      "kibana": "5.4.0"
     }
   },
   "locations" : [

diff --git a/src/createUiDefinition.json b/src/createUiDefinition.json
@@ -54,7 +54,7 @@
             "name": "esVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Elasticsearch version",
-            "defaultValue": "v5.3.2",
+            "defaultValue": "v5.4.0",
             "toolTip": "Choose a version of Elasticsearch.",
             "constraints": {
               "allowedValues": [
@@ -93,6 +93,10 @@
                 {
                   "label": "v5.3.2",
                   "value": "5.3.2"
+                },
+                {
+                  "label": "v5.4.0",
+                  "value": "5.4.0"
                 }
               ]
             }

diff --git a/src/mainTemplate.json b/src/mainTemplate.json
@@ -20,7 +20,7 @@
     },
     "esVersion": {
       "type": "string",
-      "defaultValue": "5.3.2",
+      "defaultValue": "5.4.0",
       "allowedValues": [
         "2.0.2",
         "2.1.2",
@@ -30,7 +30,8 @@
         "5.0.2",
         "5.1.2",
         "5.2.2",
-        "5.3.2"
+        "5.3.2",
+        "5.4.0"
       ],
       "metadata": {
         "description": "Elasticsearch version to install"
@@ -819,7 +820,8 @@
       "5.0.2": "5.0.2",
       "5.1.2": "5.1.2",
       "5.2.2": "5.2.2",
-      "5.3.2": "5.3.2"
+      "5.3.2": "5.3.2",
+      "5.4.0": "5.4.0"
     },
     "esSettings": {
       "clusterName": "[parameters('esClusterName')]",