This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 176fe8777f Merge branch '2.1' new 7f19f96914 Add a last location mode property (#3142) new 3c7408ecf6 Merge branch '2.1' new ab8e2f5188 Remove some unused code to get rid of warnings The 3 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: .../org/apache/accumulo/core/conf/Property.java | 10 +++ .../apache/accumulo/core/conf/PropertyType.java | 3 + .../spi/compaction/DefaultCompactionPlanner.java | 4 -- .../util/compaction/CompactionServicesConfig.java | 6 +- .../accumulo/core/conf/PropertyTypeTest.java | 6 ++ .../server/conf/CheckCompactionConfig.java | 2 +- .../server/manager/state/MetaDataStateStore.java | 14 +++- .../server/manager/state/TabletStateStore.java | 2 +- .../server/manager/state/ZooTabletStateStore.java | 12 +++- .../accumulo/server/util/ManagerMetadataUtil.java | 79 ++++++++++++++++++---- .../manager/state/RootTabletStateStoreTest.java | 9 ++- .../accumulo/server/zookeeper/ZooAclUtilTest.java | 4 -- .../accumulo/manager/TabletGroupWatcher.java | 9 +++ .../tserver/compactions/CompactionManager.java | 15 +--- .../accumulo/tserver/tablet/CompactableUtils.java | 9 --- ...AssignmentIT.java => AssignLocationModeIT.java} | 37 ++++++---- ...ssignmentIT.java => CompactLocationModeIT.java} | 32 +++++++-- 17 files changed, 176 insertions(+), 77 deletions(-) copy test/src/main/java/org/apache/accumulo/test/functional/{ManagerAssignmentIT.java => AssignLocationModeIT.java} (71%) copy test/src/main/java/org/apache/accumulo/test/functional/{ManagerAssignmentIT.java => CompactLocationModeIT.java} (74%)