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/4e3696f1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4e3696f1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4e3696f1 Branch: refs/heads/master Commit: 4e3696f133b4b02dbdba1af699c67bf3f999f9ac Parents: 61de680 b3f6e0f Author: Mike Drob <md...@cloudera.com> Authored: Thu Apr 3 18:57:10 2014 -0700 Committer: Mike Drob <md...@cloudera.com> Committed: Thu Apr 3 18:57:10 2014 -0700 ---------------------------------------------------------------------- .../java/org/apache/accumulo/tserver/InMemoryMap.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) ----------------------------------------------------------------------
