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

Added LICENSE and NOTICE files for all plugins

2015-06-23 12:50:31 +02:00

src

Merge branch 'master' into feature/search-request-refactoring

2015-10-15 11:02:34 +01:00

pom.xml

Add xlint ignores for warning classes, where appropriate.

2015-09-09 12:47:07 -07:00