This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
from acabbad4ad NIFI-14629 Added timeout blocking to ConsumeKinesisStream
add 88af7fb4bc NIFI-14669 Fixed cluster response merging of duplicate
Allowable Values (#10026)
No new revisions were added by this update.
Summary of changes:
.../nifi/cluster/manager/PropertyDescriptorDtoMerger.java | 15 +++++++++++++--
.../cluster/manager/PropertyDescriptorDtoMergerTest.java | 10 ++++++++++
2 files changed, 23 insertions(+), 2 deletions(-)
