accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [13/34] accumulo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Date Fri, 24 Apr 2015 23:20:59 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/34af43fd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/34af43fd
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/34af43fd

Branch: refs/heads/master
Commit: 34af43fd02626eca3c42bc3a39ccf4ab8b927806
Parents: ac176e1 9df45b2
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Fri Mar 20 10:51:21 2015 -0400
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Fri Mar 20 10:51:21 2015 -0400

----------------------------------------------------------------------
 TESTING.md                                      |   1 +
 assemble/bin/accumulo                           |   3 +-
 .../core/client/impl/ThriftScanner.java         |  17 +-
 .../org/apache/accumulo/core/data/Mutation.java |  60 +++++-
 .../apache/accumulo/core/data/MutationTest.java |  42 +++++
 .../mapreduce/bulk/BulkIngestExample.java       |   4 +
 .../standalone/StandaloneAccumuloCluster.java   |  10 +-
 .../standalone/StandaloneClusterControl.java    |  25 ++-
 .../accumulo/harness/AccumuloClusterIT.java     |   2 +-
 .../StandaloneAccumuloClusterConfiguration.java |  16 ++
 .../apache/accumulo/proxy/SimpleProxyBase.java  | 185 ++++++++-----------
 .../apache/accumulo/proxy/TBinaryProxyIT.java   |   6 -
 .../apache/accumulo/proxy/TCompactProxyIT.java  |   6 -
 .../accumulo/proxy/TJsonProtocolProxyIT.java    |   6 -
 .../apache/accumulo/proxy/TTupleProxyIT.java    |   6 -
 .../accumulo/test/BulkImportVolumeIT.java       |   3 +
 .../apache/accumulo/test/ScanIteratorIT.java    |   7 +
 .../accumulo/test/UserCompactionStrategyIT.java |   4 +
 .../apache/accumulo/test/functional/BulkIT.java |  22 +--
 .../functional/BulkSplitOptimizationIT.java     |   1 +
 .../accumulo/test/functional/CompactionIT.java  |   1 +
 .../accumulo/test/functional/DeleteIT.java      |   5 -
 .../test/functional/FunctionalTestUtils.java    |   7 +
 23 files changed, 269 insertions(+), 170 deletions(-)
----------------------------------------------------------------------



Mime
View raw message