Christoph Büscher 1aae68d2e8 Merge branch 'master' into feature/query-refactoring ... Conflicts: core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java core/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java core/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java core/src/main/java/org/elasticsearch/index/query/QueryParser.java		2015-09-22 12:43:55 +02:00
..
main/java/org/elasticsearch	Merge branch 'master' into feature/query-refactoring	2015-09-22 12:43:55 +02:00
test	[test] Fix search context check in DeleteByQueryTests	2015-09-17 12:17:40 +02:00