Lee Hinman 6e8cf0973f [7.x] Disallow merging existing mapping field definitions in templates (#57701) (#57822) ... Backports the following commits to 7.x: Disallow merging existing mapping field definitions in templates (#57701)		2020-06-08 12:56:09 -06:00
..
licenses	Update Lucene version to 8.6.0-snapshot-9d6c738ffce (#57024)	2020-05-21 11:28:16 +01:00
src	[7.x] Disallow merging existing mapping field definitions in templates (#57701) (#57822)	2020-06-08 12:56:09 -06:00
build.gradle	Include vendored code notices in distribution notice files (#57017) (#57569)	2020-06-04 10:34:24 -07:00