Merge branch '1.5.1-SNAPSHOT' into 1.5.1-SNAPSHOT-1.4.4-SNAPSHOT-merged
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8622b4d6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8622b4d6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8622b4d6 Branch: refs/heads/master Commit: 8622b4d670ecb3fde53022cb6588df649357d2c9 Parents: 8e1e2a5 1c44069 Author: Josh Elser <[email protected]> Authored: Tue Jul 30 20:03:40 2013 -0400 Committer: Josh Elser <[email protected]> Committed: Tue Jul 30 20:03:40 2013 -0400 ---------------------------------------------------------------------- assemble/scripts/init.d/accumulo-tserver | 2 + .../core/client/admin/TableOperationsImpl.java | 14 +- .../apache/accumulo/server/master/Master.java | 7 +- .../accumulo/server/tabletserver/Compactor.java | 9 +- .../org/apache/accumulo/test/CloneTest.java | 133 +++++++++++++++++++ 5 files changed, 158 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
