[accumulo] branch main updated (f8b7b03694 -> abcf8663bc)

[ct...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


    from f8b7b03694 Use constants for tables instead of string literals (#3089)
     add 69893718dd Hide Thrift generated files on GitHub diff (#3093)
     add fecffd4b12 Add missing deprecation annotations in Mutation (#3090)
     new abcf8663bc 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:
 .../accumulo/test/shellit.shellit => .gitattributes     |  3 +--
 .../apache/accumulo/core/data/ConditionalMutation.java  |  1 +
 .../java/org/apache/accumulo/core/data/Mutation.java    | 17 ++++++++++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)
 copy test/src/main/resources/org/apache/accumulo/test/shellit.shellit => .gitattributes (93%)

[accumulo] 01/01: Merge branch '2.1'

[ct...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit abcf8663bc99b4a0c759a76ae878ae6d454da915
Merge: f8b7b03694 fecffd4b12
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Tue Nov 29 17:33:24 2022 -0500

    Merge branch '2.1'

 .gitattributes                                       | 20 ++++++++++++++++++++
 .../accumulo/core/data/ConditionalMutation.java      |  1 +
 .../java/org/apache/accumulo/core/data/Mutation.java | 17 ++++++++++++++++-
 3 files changed, 37 insertions(+), 1 deletion(-)