This is an automated email from the ASF dual-hosted git repository.
ejttianyu pushed a change to branch dev_new_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from cdd2a17 Merge branch 'master' into dev_new_merge
add 7441fda resolve conflicts Version2
add af61a57 resolve conflects version3
add 3580423 Merge branch 'dev_new_merge' of
github.com:apache/incubator-iotdb into dev_new_merge
No new revisions were added by this update.
Summary of changes:
.../main/java/org/apache/iotdb/db/engine/StorageEngine.java | 10 +++++-----
.../org/apache/iotdb/db/sync/receiver/load/FileLoader.java | 3 +--
2 files changed, 6 insertions(+), 7 deletions(-)
