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 2013/12/12 20:29:16 UTC

[3/4] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT'


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

Branch: refs/heads/master
Commit: c9f07d38725ab2935c24b1c3dddefa039080a2b4
Parents: 403815f 7a840db
Author: Eric Newton <er...@gmail.com>
Authored: Thu Dec 12 14:29:08 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Dec 12 14:29:08 2013 -0500

----------------------------------------------------------------------
 .../java/org/apache/accumulo/master/Master.java | 11 ++++--
 .../accumulo/master/tableOps/CompactRange.java  | 15 +++++---
 .../accumulo/test/functional/MetadataIT.java    | 38 ++++++++++++++++++++
 3 files changed, 57 insertions(+), 7 deletions(-)
----------------------------------------------------------------------