2 Commits

Author	SHA1	Message	Date
Joe Witt	43eab4c81d	NIFI-11103 prepping for 2.0.0 line	2023-02-09 15:32:53 -07:00
krisztina-zsihovszki	96a6594680	NIFI-11068 Introduced ConflictResolutionStrategy enum ... This closes #6861 Signed-off-by: David Handermann <exceptionfactory@apache.org>	2023-01-26 15:34:43 -06:00