David Pilato fd509d015c Merge remote-tracking branch 'origin/master' ... # Conflicts: # client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java		2017-02-24 11:52:56 +01:00
..
src	Merge remote-tracking branch 'origin/master'	2017-02-24 11:52:56 +01:00
build.gradle	Enforce Content-Type requirement on the rest layer and remove deprecated methods (#23146)	2017-02-17 14:45:41 -05:00