Christoph Büscher 42e8d4b761 Merge branch 'master' into feature/client_aggs_parsing ... Conflicts: core/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilterTests.java core/src/test/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobalTests.java core/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissingTests.java core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNestedTests.java core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNestedTests.java core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSamplerTests.java modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/InternalChildrenTests.java test/framework/src/main/java/org/elasticsearch/search/aggregations/InternalSingleBucketAggregationTestCase.java		2017-05-15 12:25:07 +02:00
..
src	Merge branch 'master' into feature/client_aggs_parsing	2017-05-15 12:25:07 +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