Tanguy Leroux 5717ac3cc6 Merge remote-tracking branch 'origin/master' into feature/client_aggs_parsing ... # Conflicts: # core/src/main/java/org/elasticsearch/search/DocValueFormat.java # core/src/test/java/org/elasticsearch/search/aggregations/InternalAggregationTestCase.java # core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMaxTests.java # core/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvgTests.java # core/src/test/java/org/elasticsearch/search/aggregations/metrics/min/InternalMinTests.java		2017-04-19 10:12:11 +02:00
..
src	Merge remote-tracking branch 'origin/master' into feature/client_aggs_parsing	2017-04-19 10:12:11 +02:00
.gitignore	Build: Add fake project to include buildSrc as normal project	2016-05-06 22:26:15 -07:00
build.gradle	Build: remove progress logger hack for gradle 2.13 (#23679)	2017-03-21 23:32:40 -07:00
version.properties	Upgrade to a Lucene 7 snapshot (#24089)	2017-04-18 15:17:21 +02:00