Chris Roberson 389115cad0 Ensure conflicted fields can be searchable and/or aggregatable (#13070) ... * Ensure that conflict fields can be searchable and/or aggregatable in the UI * Use `some` instead of `reduce` * Revert UI changes * Attempt to convert multiple ES types to kibana types, and if they all resolve to the same kibana type, there is no conflict * Add comma back * Cleaner code * Add tests * Update failing test to handle searchable and aggregatable properly * Add functional test to ensure similar ES types are properly merged * Update tests * Revert shard size		2017-07-28 10:45:43 -04:00
..
es_archiver	Ensure conflicted fields can be searchable and/or aggregatable (#13070)	2017-07-28 10:45:43 -04:00