You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/09/29 15:36:48 UTC

[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

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/1dfe826c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1dfe826c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1dfe826c

Branch: refs/heads/master
Commit: 1dfe826ced4fc83aaefb727f889cd3b53dbd86a2
Parents: 72156b8 159d1b9
Author: Eric C. Newton <er...@gmail.com>
Authored: Mon Sep 29 09:36:33 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Mon Sep 29 09:36:33 2014 -0400

----------------------------------------------------------------------
 .../accumulo/master/FateServiceHandler.java     | 156 +++++++++++++++++--
 .../test/BadDeleteMarkersCreatedIT.java         |  27 +++-
 .../test/ConfigurableMajorCompactionIT.java     |   7 +-
 .../accumulo/test/functional/ExamplesIT.java    | 118 ++++++--------
 .../accumulo/test/functional/LargeRowIT.java    |  89 ++++++-----
 .../accumulo/test/functional/MergeIT.java       |  11 +-
 .../accumulo/test/functional/PermissionsIT.java |   9 +-
 .../test/replication/CyclicReplicationIT.java   |  11 +-
 .../test/replication/ReplicationIT.java         | 148 +++++++++---------
 .../UnorderedWorkAssignerReplicationIT.java     |  33 ++--
 10 files changed, 396 insertions(+), 213 deletions(-)
----------------------------------------------------------------------