Christoph Büscher 1c02e48a8f Merge branch 'master' into feature/rank-eval ...

Conflicts:
	test/framework/src/main/java/org/elasticsearch/test/TestCluster.java

2016-09-01 13:06:21 +02:00

..

src

Merge branch 'master' into feature/rank-eval

2016-09-01 13:06:21 +02:00

build.gradle

Introduce Log4j 2

2016-08-30 13:31:24 -04:00