Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5eede28e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5eede28e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5eede28e Branch: refs/heads/master Commit: 5eede28e0dd0d00874c5f67a24de204226066ca0 Parents: 844166a 341034a Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Jun 12 11:59:03 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Jun 12 11:59:03 2015 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/client/lexicoder/AbstractEncoder.java | 2 +- .../core/client/lexicoder/impl/AbstractLexicoderTest.java | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) ----------------------------------------------------------------------
