This is an automated email from the ASF dual-hosted git repository. haonan pushed a change to branch ty/RetryTooManyQueries in repository https://gitbox.apache.org/repos/asf/iotdb.git
was 227074be91c 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.
