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
..
main	Merge branch 'master' into pr/16598-register-filter-settings	2016-03-13 14:52:10 +01:00
test	Merge branch 'master' into cli-parsing	2016-03-11 10:45:05 -08:00