Christoph Büscher bab9523c56 Merge branch 'master' into feature/query-refactoring ...

Conflicts:
	core/src/main/java/org/elasticsearch/ElasticsearchException.java

2015-09-18 12:05:03 +02:00

..

licenses

no_deps.txt should be in the licenses/ directory in plugins

2015-08-09 20:16:11 +02:00

src

Merge branch 'master' into feature/query-refactoring

2015-09-18 12:05:03 +02:00

.gitignore

Refactor pluginservice

2015-07-22 10:45:45 -04:00

LICENSE.txt

Added LICENSE and NOTICE files for all plugins

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

NOTICE.txt

Added LICENSE and NOTICE files for all plugins

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

pom.xml

Move version to 3.0.0-SNAPSHOT

2015-09-03 10:43:28 +02:00