Adrien Grand 3f86adddbf Remove MergeMappingException. ... Failures to merge a mapping can either come as a MergeMappingException if they come from Mapper.merge or as an IllegalArgumentException if they come from FieldTypeLookup.checkCompatibility. I think we should settle on one: this pull request replaces all usage of MergeMappingException with IllegalArgumentException.		2015-12-04 12:56:26 +01:00
..
main/java/org/elasticsearch	Remove MergeMappingException.	2015-12-04 12:56:26 +01:00
test	[TEST] Fix MapperUpgrade tests to use a dedicated master to ensure dangeling index import works predictably	2015-11-27 10:32:21 +01:00