Colin Goodheart-Smithe 859f9e69b7 Merge branch 'master' into feature/aggs-refactoring ...

# Conflicts:
#	core/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java
#	core/src/main/java/org/elasticsearch/percolator/PercolateContext.java
#	core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java
#	core/src/main/java/org/elasticsearch/search/internal/DefaultSearchContext.java
#	core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java

2016-01-29 11:58:19 +00:00

..

ingest-grok

adapt to upstream changes, jvm flag doesn't get returned anymore

2016-01-25 18:01:19 +01:00

lang-expression

Merge branch 'master' into feature/aggs-refactoring

2016-01-27 14:54:12 +00:00

lang-groovy

Merge branch 'master' into feature/aggs-refactoring

2016-01-29 11:58:19 +00:00

lang-mustache

Make index uuid available in Index, ShardRouting & ShardId

2016-01-28 08:40:10 +01:00

build.gradle

Plugins: Remove site plugins

2016-01-16 22:45:37 -08:00