Merge branch 'master' into enhancement/node_client_setting_removal

Original commit: elastic/x-pack-elasticsearch@9e3ce673c9
This commit is contained in:
javanna 2016-03-22 10:43:04 +01:00 committed by Luca Cavanna
commit 6d1d8b7832

Diff Content Not Available