Colin Goodheart-Smithe f06f17f328 Merge branch 'master' into feature/aggs-refactoring ... # Conflicts: # core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java # core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java		2016-02-05 09:22:14 +00: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/aggs-refactoring	2016-02-05 09:22:14 +00:00
build.gradle	Build: Add fixture capabilities to integ tests	2015-12-19 15:46:21 -08:00