This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a commit to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit a214c108821e2edbe7640e0dc8761b38f5e898a0 Merge: 4c3b2d0a58 acc8746d2e Author: Dave Marion <dlmar...@apache.org> AuthorDate: Wed Jul 10 18:19:02 2024 +0000 Merge branch 'main' into elasticity .../org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java | 4 ++-- .../apache/accumulo/core/data/constraints/VisibilityConstraint.java | 4 ++-- .../apache/accumulo/core/iterators/user/TransformingIterator.java | 6 +++--- .../org/apache/accumulo/core/iterators/user/VisibilityFilter.java | 6 +++--- .../apache/accumulo/core/iteratorsImpl/system/VisibilityFilter.java | 4 ++-- .../java/org/apache/accumulo/core/security/ColumnVisibility.java | 4 ++-- .../java/org/apache/accumulo/core/security/VisibilityEvaluator.java | 4 ++-- .../org/apache/accumulo/core/security/VisibilityParseException.java | 4 ++-- .../java/org/apache/accumulo/core/util/BadArgumentException.java | 4 ++-- pom.xml | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-)