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

..

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-22 12:43:55 +02:00

.gitignore

Refactor pluginservice

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

pom.xml

Move version to 3.0.0-SNAPSHOT

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