Merge branch '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/a53d4ec0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a53d4ec0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a53d4ec0 Branch: refs/heads/master Commit: a53d4ec05542a3d045e1dff52280986a7cfdc119 Parents: 29e6dee 5d2cf87 Author: Mike Drob <md...@cloudera.com> Authored: Thu May 15 14:33:24 2014 -0400 Committer: Mike Drob <md...@cloudera.com> Committed: Thu May 15 14:33:24 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(-) ----------------------------------------------------------------------
