Repository: accumulo Updated Branches: refs/heads/1.4.6-SNAPSHOT 80f8afb10 -> 5bd4465c4 refs/heads/1.5.2-SNAPSHOT 89c1b737d -> 08c255a26 refs/heads/1.6.0-SNAPSHOT b3e4becd4 -> 15e4f002f refs/heads/master 28816315f -> 43a44ba82
Merge branch '1.5.2-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/89c1b737 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/89c1b737 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/89c1b737 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 89c1b737dd7fae64e2ab4c8a1cf22d77f8dcf067 Parents: ff8c238 83ef6b8 Author: Josh Elser <els...@apache.org> Authored: Tue Apr 29 12:23:04 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Tue Apr 29 12:23:04 2014 -0400 ---------------------------------------------------------------------- .../core/client/admin/TableOperations.java | 15 ++- .../accumulo/core/client/impl/Writer.java | 6 +- .../accumulo/core/file/rfile/CreateEmpty.java | 79 ++++++++++++++ .../core/file/rfile/RFileOperations.java | 6 +- pom.xml | 2 + .../server/tabletserver/TabletTime.java | 4 + test/system/auto/simple/recoverWithEmpty.py | 104 +++++++++++++++++++ 7 files changed, 201 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
