Merge branch 'master' into feature/http_client

Original commit: elastic/x-pack-elasticsearch@4569a0457e
This commit is contained in:
javanna 2016-06-10 11:18:37 +02:00 committed by Luca Cavanna
commit 185ded3faa

Diff Content Not Available