Merge remote-tracking branch 'upstream/2.1'

Original commit: elastic/x-pack-elasticsearch@516478e333
This commit is contained in:
Timothy Sullivan 2015-11-24 09:26:23 -07:00
commit f7a69c4e02
1 changed files with 40 additions and 2 deletions

View File

@ -202,6 +202,40 @@
} }
} }
}, },
"node": {
"properties": {
"state_uuid": {
"type": "string",
"index": "not_analyzed"
},
"node": {
"properties": {
"id": { "type": "string", "index": "not_analyzed" },
"name": { "type": "string", "index": "not_analyzed" },
"transport_address": { "type": "string", "index": "not_analyzed" },
"master": { "type": "boolean" },
"attributes": { "type": "object" }
}
}
}
},
"nodes": {
"properties": {
"state_uuid": {
"type": "string",
"index": "not_analyzed"
},
"node": {
"properties": {
"id": { "type": "string", "index": "not_analyzed" },
"name": { "type": "string", "index": "not_analyzed" },
"transport_address": { "type": "string", "index": "not_analyzed" },
"master": { "type": "boolean" },
"attributes": { "type": "object" }
}
}
}
},
"shards": { "shards": {
"properties": { "properties": {
"state_uuid": { "state_uuid": {
@ -220,6 +254,8 @@
} }
} }
}, },
"index_recovery": {
"properties": {
"index_recovery": { "index_recovery": {
"properties": { "properties": {
"shards": { "shards": {
@ -228,4 +264,6 @@
} }
} }
} }
}
}
} }