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
..
licenses	Upgrade to aws 1.10.33	2015-11-10 22:51:33 -05:00
src	Merge branch 'master' into pr/16598-register-filter-settings	2016-03-13 14:52:10 +01:00
build.gradle	Remove -Xlint:-deprecation from plugins	2016-01-07 20:44:46 -05:00