This is an automated email from the ASF dual-hosted git repository. cshannon pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 69584e2835 Merge branch '2.1' add 10f45c4112 Backport FlakyFate and idempotent tests for Merge and DeleteRows (#4656) new 7724f6ad7b Merge branch '2.1' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/org/apache/accumulo/core/fate/Fate.java | 7 +++ .../MiniAccumuloClusterControl.java | 30 +++++------ .../miniclusterImpl/MiniAccumuloConfigImpl.java | 40 +++++++++++++++ .../java/org/apache/accumulo/manager/Manager.java | 10 +++- .../org/apache/accumulo/test/fate/FlakyFate.java | 59 ++++++++++++++++++++++ .../FlakyFateManager.java} | 32 ++++++------ .../functional/DeleteRowsFlakyFateIT.java} | 27 ++++------ .../functional/MergeFlakyFateIT.java} | 26 ++++------ 8 files changed, 163 insertions(+), 68 deletions(-) create mode 100644 test/src/main/java/org/apache/accumulo/test/fate/FlakyFate.java copy test/src/main/java/org/apache/accumulo/test/{compaction/ExternalCompactionTServer.java => fate/FlakyFateManager.java} (53%) copy test/src/main/java/org/apache/accumulo/{harness/MiniClusterConfigurationCallback.java => test/functional/DeleteRowsFlakyFateIT.java} (60%) copy test/src/main/java/org/apache/accumulo/{harness/MiniClusterConfigurationCallback.java => test/functional/MergeFlakyFateIT.java} (61%)