Merge branch 'master' into gh-2200-xpack-info-api

Original commit: elastic/x-pack-elasticsearch@9c9e6df720
This commit is contained in:
Shaunak Kashyap 2016-06-10 09:52:02 -07:00
commit 98686f05a6

Diff Content Not Available