Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1132ae05 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1132ae05 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1132ae05 Branch: refs/heads/master Commit: 1132ae05ac006393151d1efb1f8db1693defc592 Parents: 8c3c078 67f5e95 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Jul 28 18:41:51 2017 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Jul 28 18:41:51 2017 -0400 ---------------------------------------------------------------------- .../security/tokens/AuthenticationToken.java | 12 +++++++---- .../impl/MiniAccumuloClusterControl.java | 10 ++++----- .../minicluster/impl/ProcessReference.java | 22 +++++++++++--------- .../apache/accumulo/server/util/DefaultMap.java | 5 +++-- .../accumulo/test/functional/LargeRowIT.java | 2 +- 5 files changed, 29 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
