Christoph Büscher 69c83b3459 Merge branch 'master' into feature-suggest-refactoring ...

Conflicts:
	core/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java
        core/src/main/java/org/elasticsearch/search/suggest/SuggestParseElement.java
	core/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java
	core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java

2016-03-10 11:44:36 +01:00

..

fixtures

in the plugin: guard against HADOOP_HOME in environment on any platform.

2015-12-21 02:21:53 -05:00

framework

Merge branch 'master' into feature-suggest-refactoring

2016-03-10 11:44:36 +01:00

build.gradle

Build: Add fixture capabilities to integ tests

2015-12-19 15:46:21 -08:00