This is an automated email from the ASF dual-hosted git repository. jackietien pushed a change to branch force_ci/prepstm in repository https://gitbox.apache.org/repos/asf/iotdb.git
was ab853e8c9b9 Resolve conflicts
The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.
