This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit cda3be981ea42dead5eeff0374590337f7b76c93 Merge: 2cd5b4c 68f8f5e Author: Christopher Tubbs <[email protected]> AuthorDate: Sun Jun 9 21:18:10 2019 -0400 Merge branch '2.0' .../mapreduce/lib/partition/RangePartitioner.java | 50 +++++-------- .../clientImpl/mapreduce/lib/ConfiguratorBase.java | 85 ++++++++++------------ .../mapreduce/lib/DistributedCacheHelper.java | 59 +++++++++++++-- .../mapreduce/partition/RangePartitioner.java | 50 +++++-------- .../hadoopImpl/mapreduce/lib/ConfiguratorBase.java | 39 ++++------ .../org/apache/accumulo/shell/ShellOptionsJC.java | 4 +- .../accumulo/shell/PasswordConverterTest.java | 3 +- .../apache/accumulo/test/mapred/TokenFileIT.java | 15 +++- .../accumulo/test/mapreduce/TokenFileIT.java | 29 +++++++- 9 files changed, 189 insertions(+), 145 deletions(-)
