Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9e89b65d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9e89b65d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9e89b65d Branch: refs/heads/master Commit: 9e89b65d5068aef706894b211bff4c62ed16259c Parents: ecf2298 2e51eec Author: Eric C. Newton <eric.new...@gmail.com> Authored: Mon Jun 15 09:59:49 2015 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Mon Jun 15 09:59:49 2015 -0400 ---------------------------------------------------------------------- .../core/client/lexicoder/AbstractEncoder.java | 2 +- .../lexicoder/impl/AbstractLexicoderTest.java | 5 ---- mrit/.gitignore | 1 - mrit/pom.xml | 2 -- pom.xml | 5 ++++ .../accumulo/test/proxy/SimpleProxyBase.java | 29 +++++++++++--------- 6 files changed, 22 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
