This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch IOTDB-4619
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 312a142f51 resolve conflicts
add ef7b00713b Fix CI
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/iotdb/confignode/persistence/TriggerInfo.java | 5 ++++-
.../main/java/org/apache/iotdb/db/mpp/common/MPPQueryContext.java | 1 +
.../apache/iotdb/db/mpp/plan/execution/config/ConfigExecution.java | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
