Colin Goodheart-Smithe c618f75b76 Merge branch 'master' into feature/search-request-refactoring ... # Conflicts: # core/src/main/java/org/elasticsearch/search/SearchService.java		2015-10-15 11:02:34 +01:00
..
licenses	Factor expressions scripts out to lang-expression plugin	2015-09-22 20:33:47 -04:00
src	Merge branch 'master' into feature/search-request-refactoring	2015-10-15 11:02:34 +01:00
pom.xml	Remove -Xlint:-serial, the crazy exceptions are now gone	2015-09-22 20:51:11 -04:00