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

Original commit: elastic/x-pack-elasticsearch@f05242978f
This commit is contained in:
Chris Cowan 2015-11-05 14:09:51 -07:00
commit 04dc3d4c91

Diff Content Not Available