accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] 01/01: Merge branch '2.0'
Date Tue, 23 Jul 2019 19:01:53 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 52d5d8e8baf80597aee8fa6b6201c240bb72fb42
Merge: 76b06ba c2cfa19
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Tue Jul 23 15:01:14 2019 -0400

    Merge branch '2.0'

 assemble/conf/log4j-service.properties                    |  1 -
 core/pom.xml                                              |  2 --
 .../accumulo/core/client/lexicoder/AbstractEncoder.java   | 11 +++++------
 .../core/client/lexicoder/BigIntegerLexicoder.java        |  8 +++-----
 .../accumulo/core/client/lexicoder/DateLexicoder.java     |  4 ++--
 .../accumulo/core/client/lexicoder/DoubleLexicoder.java   |  4 ++--
 .../apache/accumulo/core/client/lexicoder/Encoder.java    |  5 +++--
 .../accumulo/core/client/lexicoder/FloatLexicoder.java    |  7 +++----
 .../accumulo/core/client/lexicoder/IntegerLexicoder.java  |  4 ++--
 .../accumulo/core/client/lexicoder/ListLexicoder.java     |  4 ++--
 .../accumulo/core/client/lexicoder/PairLexicoder.java     |  4 ++--
 .../accumulo/core/client/lexicoder/StringLexicoder.java   |  4 ++--
 .../accumulo/core/client/lexicoder/TextLexicoder.java     |  4 ++--
 .../accumulo/core/client/lexicoder/UIntegerLexicoder.java |  4 ++--
 .../accumulo/core/client/lexicoder/ULongLexicoder.java    |  4 ++--
 .../accumulo/core/client/lexicoder/UUIDLexicoder.java     |  7 +++----
 .../org/apache/accumulo/core/iterators/LongCombiner.java  | 15 ++++++++-------
 .../accumulo/core/iterators/TypedValueCombiner.java       | 11 +----------
 .../accumulo/core/iterators/user/BigDecimalCombiner.java  |  4 ++--
 .../core/iterators/user/SummingArrayCombiner.java         | 11 ++++++-----
 .../core/iterators/user/BigDecimalCombinerTest.java       |  2 +-
 .../apache/accumulo/core/iterators/user/CombinerTest.java |  2 +-
 .../core/iterators/user/VersioningIteratorTest.java       |  2 +-
 test/src/main/resources/log4j.properties                  |  1 -
 24 files changed, 55 insertions(+), 70 deletions(-)



Mime
View raw message