Merge remote-tracking branch 'upstream/master'

Original commit: elastic/x-pack-elasticsearch@b547d23236
This commit is contained in:
Khalah Jones-Golden 2015-08-31 12:38:42 -04:00
commit e480aa778e

View File

@ -198,6 +198,13 @@
}
}
},
"marvel_indices_stats": {
"properties": {
"indices_stats": {
"type": "object"
}
}
},
"marvel_index_recovery": {
"properties": {
"shards": {