Merge branch '2.1' of github.com:elasticsearch/elasticsearch-marvel into rest-refactor

Original commit: elastic/x-pack-elasticsearch@3ac660d147
This commit is contained in:
Chris Cowan 2015-11-04 09:49:35 -07:00
commit dacfe77365

View File

@ -220,6 +220,8 @@
}
}
},
"index_recovery": {
"properties": {
"index_recovery": {
"properties": {
"shards": {
@ -228,4 +230,6 @@
}
}
}
}
}
}