David Pilato c11cf3bf1f Merge branch 'master' into pr/16598-register-filter-settings ...

# Conflicts:
#	core/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java
#	core/src/main/java/org/elasticsearch/common/settings/Setting.java
#	core/src/test/java/org/elasticsearch/common/settings/SettingTests.java

2016-03-04 12:23:10 +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 pr/16598-register-filter-settings

2016-03-04 12:23:10 +01:00

build.gradle

Build: Add fixture capabilities to integ tests

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