Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 57f27635b -> b2ecd1cdb refs/heads/1.6.1-SNAPSHOT d54de55f5 -> 0cdd5fd08 refs/heads/master 8195930ab -> 31ebacfec
Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d54de55f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d54de55f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d54de55f Branch: refs/heads/master Commit: d54de55f5a07db219bdd2d894154459bb2192922 Parents: a16f599 5d2cf87 Author: Josh Elser <els...@apache.org> Authored: Thu May 15 14:34:15 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu May 15 14:34:15 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/tserver/log/LocalWALRecovery.java | 3 +-- .../org/apache/accumulo/tserver/log/LocalWALRecoveryTest.java | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
