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	Build: Remove transitive dependencies	2015-11-10 15:01:41 -08:00
src	Merge branch 'master' into pr/16598-register-filter-settings	2016-03-13 14:52:10 +01:00
build.gradle	Move keystore creation to gradle - this prevents committing a keystore to the source repo	2016-02-29 22:01:39 +01:00