David Pilato 4d272cc9b2 Merge branch 'master' into fix/19772-toString ...

# Conflicts:
#	core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java

2016-08-09 11:53:29 +02:00

..

src

Merge branch 'master' into fix/19772-toString

2016-08-09 11:53:29 +02:00

build.gradle

Remove duplicate dependency declaration for http client (#19580)

2016-07-26 06:29:04 +02:00