David Pilato 9acb0bb28c Merge branch 'master' into pr/16598-register-filter-settings ... # Conflicts: # core/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java # core/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java # core/src/main/java/org/elasticsearch/common/settings/Setting.java		2016-03-13 14:52: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-13 14:52:10 +01:00
logger-usage	Check that number of placeholders in log message matches number of parameters	2016-03-11 10:30:59 +01:00
build.gradle	Check that number of placeholders in log message matches number of parameters	2016-03-11 10:30:59 +01:00