This is an automated email from the ASF dual-hosted git repository.
kturner pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 829a8ec624 Merge branch '2.1'
add 9d1377c756 Detects iterator conflicts (#6040)
add 416ba0557e Merge branch '2.1'
No new revisions were added by this update.
Summary of changes:
.../core/client/admin/NewTableConfiguration.java | 23 +-
.../core/clientImpl/NamespaceOperationsHelper.java | 43 +-
.../core/clientImpl/TableOperationsHelper.java | 41 +-
.../core/clientImpl/TableOperationsImpl.java | 10 +-
.../core/iteratorsImpl/IteratorConfigUtil.java | 144 +++-
.../core/iteratorsImpl/IteratorProperty.java | 160 ++++
.../accumulo/server/conf/TableConfiguration.java | 30 +
.../accumulo/manager/FateServiceHandler.java | 50 +-
.../manager/ManagerClientServiceHandler.java | 14 +
.../accumulo/tserver/tablet/ScanDataSource.java | 41 +
test/pom.xml | 8 +
.../test/NewTableConfigurationIT_SimpleSuite.java | 10 +-
.../test/functional/IteratorConflictsIT.java | 834 +++++++++++++++++++++
13 files changed, 1279 insertions(+), 129 deletions(-)
create mode 100644
core/src/main/java/org/apache/accumulo/core/iteratorsImpl/IteratorProperty.java
create mode 100644
test/src/main/java/org/apache/accumulo/test/functional/IteratorConflictsIT.java
