You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2016/04/07 18:35:03 UTC
[4/7] accumulo git commit: Merge branch '1.6' into 1.7
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/master
Commit: eb6a0381054becda3ade7e634b92e76546614ca0
Parents: f7a24d7 b8084af
Author: Josh Elser <el...@apache.org>
Authored: Thu Apr 7 12:12:48 2016 -0400
Committer: Josh Elser <el...@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
----------------------------------------------------------------------