This is an automated email from the ASF dual-hosted git repository. cshannon pushed a change to branch grpc in repository https://gitbox.apache.org/repos/asf/accumulo.git
from d1456fcaa4 Merge branch 'main' into elasticity add b09e595ca9 Add static creation method that applies offset to Timer object (#4789) add f1dc4dc05c Merge remote-tracking branch 'upstream/2.1' add cbc2c16b89 Merge remote-tracking branch 'upstream/main' into elasticity add 63ff7db77a adds check for unsplittable column in conditional update (#4793) add 262d96cc65 always uses conditional writer interceptor in test ample (#4792) add cc9515988e adds test to cover deleting unsplittable col in split code (#4794) add 0d72500bf2 Modified UserFateStore.create to behave like MetaFateStore (#4787) No new revisions were added by this update. Summary of changes: .../accumulo/core/fate/user/UserFateStore.java | 8 +-- .../java/org/apache/accumulo/core/util/Timer.java | 25 ++++++++ .../org/apache/accumulo/core/util/TimerTest.java | 34 +++++++++++ .../AsyncConditionalTabletsMutatorImpl.java | 21 +++---- .../metadata/ConditionalTabletMutatorImpl.java | 10 ++++ .../metadata/ConditionalTabletsMutatorImpl.java | 10 +++- .../accumulo/server/metadata/ServerAmpleImpl.java | 3 +- .../manager/tableOps/split/FindSplits.java | 5 +- .../org/apache/accumulo/test/LargeSplitRowIT.java | 8 ++- .../accumulo/test/ample/metadata/TestAmple.java | 13 ++++- .../apache/accumulo/test/fate/ManagerRepoIT.java | 68 +++++++++++++++++++++- .../accumulo/test/fate/user/UserFateStoreIT.java | 36 ------------ .../test/functional/AmpleConditionalWriterIT.java | 58 ++++++++++++++++++ 13 files changed, 234 insertions(+), 65 deletions(-)