Koji Kawamura e9af6c6ad8 NIFI-4828: Fix MergeContent to process all ready bins ... Before this fix, MergeContent only processed the first bin even if there were multiple bins. There were two unit tests marked with Ignore those had been failing because of this. This closes #2444. Signed-off-by: Mark Payne <markap14@hotmail.com>		2018-02-07 15:45:39 -05:00
..
main/java/org/apache/nifi/processor/util	NIFI-4828: Fix MergeContent to process all ready bins	2018-02-07 15:45:39 -05:00
test/java/org/apache/nifi/processor/util	NIFI-4664, NIFI-4662, NIFI-4660, NIFI-4659 moved tests which are timing/threading/network dependent and brittle to integration tests and un-ignored tests that are IT. Updated travis to reduce impact on infra and appveyor now skips test runs so is just to prove build works on windows. This closes #2319	2017-12-06 10:53:09 -05:00