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/ccec95b6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ccec95b6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ccec95b6 Branch: refs/heads/master Commit: ccec95b69cc40bb83627b24ec795b4898fe030ff Parents: c706289 890ee25 Author: Josh Elser <els...@apache.org> Authored: Mon Dec 2 17:54:20 2013 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Dec 2 17:54:20 2013 -0500 ---------------------------------------------------------------------- .../accumulo/server/fs/VolumeManagerImpl.java | 17 +++++++++++------ .../accumulo/tserver/log/MultiReaderTest.java | 2 -- 2 files changed, 11 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
