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/bdac06f6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bdac06f6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bdac06f6 Branch: refs/heads/master Commit: bdac06f6560fd575a33c827c0fc8d9519862004a Parents: 403815f a425f6a Author: Mike Drob <md...@cloudera.com> Authored: Thu Dec 12 10:58:48 2013 -0800 Committer: Mike Drob <md...@cloudera.com> Committed: Thu Dec 12 10:58:48 2013 -0800 ---------------------------------------------------------------------- .../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(-) ----------------------------------------------------------------------
