This is an automated email from the ASF dual-hosted git repository. jackietien pushed a change to branch ty-mpp in repository https://gitbox.apache.org/repos/asf/iotdb.git
from d34c22d1a4 resolve conflicts
add ec3e9bbba1 rename INSTANCE_MANAGER to QUERY_INSTANCE_MANAGER
No new revisions were added by this update.
Summary of changes:
.../iotdb/db/consensus/statemachine/DataRegionStateMachine.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
