Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eb6a0381 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eb6a0381 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eb6a0381 Branch: refs/heads/ACCUMULO-4173 Commit: eb6a0381054becda3ade7e634b92e76546614ca0 Parents: f7a24d7 b8084af Author: Josh Elser <els...@apache.org> Authored: Thu Apr 7 12:12:48 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Apr 7 12:12:48 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/tserver/InMemoryMap.java | 2 +- .../test/java/org/apache/accumulo/test/InMemoryMapIT.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/eb6a0381/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java ----------------------------------------------------------------------
