Merge branch '2.1' of github.com:elasticsearch/elasticsearch-marvel into rest-refactor
Original commit: elastic/x-pack-elasticsearch@236829a082
This commit is contained in:
commit
695be800ef
Original commit: elastic/x-pack-elasticsearch@236829a082