This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a change to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 9c10eca61d Merge branch '2.1' into 3.1
add 25dcfbfe14 Fix issue with ZooPropEditor setting classloader context
property (#5238)
new 7d1a816791 Merge branch '2.1' into 3.1, fix test, remove unused var
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../accumulo/core/classloader/ClassLoaderUtil.java | 2 +-
.../accumulo/server/conf/util/ZooInfoViewer.java | 2 -
.../org/apache/accumulo/server/util/PropUtil.java | 19 ++--
.../accumulo/server/util/SystemPropUtil.java | 11 ++-
.../server/conf/util/ZooInfoViewerTest.java | 5 +-
.../apache/accumulo/server/util/PropUtilTest.java | 102 +++++++++++++++++++++
6 files changed, 121 insertions(+), 20 deletions(-)
create mode 100644
server/base/src/test/java/org/apache/accumulo/server/util/PropUtilTest.java
