Merge remote-tracking branch 'upstream/master'

Original commit: elastic/x-pack-elasticsearch@af34624581
This commit is contained in:
Khalah Jones-Golden 2015-08-19 17:12:53 -04:00
commit 1d097c8d0e
1 changed files with 5 additions and 1 deletions

View File

@ -15,7 +15,11 @@
},
"date_detection": false,
"properties": {
"cluster_name": {
"cluster_uuid": {
"type": "string",
"index": "not_analyzed"
},
"cluster_uuid": {
"type": "string",
"index": "not_analyzed"
},