Christoph Büscher 744b1afcb2 Merge branch 'master' into feature/client_aggs_parsing ...

Conflicts:
	core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogramTests.java
	core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsTests.java
	core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsTests.java
	core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsTests.java

2017-05-12 10:55:05 +02:00

..

src

Merge branch 'master' into feature/client_aggs_parsing

2017-05-12 10:55:05 +02:00

.gitignore

Build: Add fake project to include buildSrc as normal project

2016-05-06 22:26:15 -07:00

build.gradle

Add task to look for tests in src/main (#24298)

2017-04-25 21:11:47 -04:00

version.properties

Bumping version to v6.0.0-alpha2

2017-05-10 17:12:56 +02:00