Ensure conflicted fields can be searchable and/or aggregatable#13070
Merged
chrisronline merged 11 commits intoelastic:masterfrom Jul 28, 2017
Merged
Commits
Commits on Jul 27, 2017
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Jul 28, 2017
- committed
- committed