Merge remote-tracking branch 'upstream/master'

Original commit: elastic/x-pack-elasticsearch@3f2ac65458
2015-08-12 20:10:08 -04:00 · 2015-08-12 20:10:08 -04:00 · 9273b726ee
parent f2e3b40e1a ff72c743d0
commit 9273b726ee
1 changed files with 7 additions and 0 deletions
--- a/marvel_index_template.json
+++ b/marvel_index_template.json
@ -25,6 +25,13 @@
        }
      }
    },
+    "marvel_licenses": {
+      "properties": {
+        "licenses": {
+          "type": "object"
+        }
+      }
+    },
    "marvel_index_stats": {
      "properties": {
        "index_stats": {