You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by xi...@apache.org on 2021/03/17 09:34:27 UTC

[iotdb] 01/01: Fix conflicts with master

This is an automated email from the ASF dual-hosted git repository.

xiangweiwei pushed a commit to branch optimizeDDP
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 0ea06c9fd6351dea39c78c15612707f5fa97dc20
Merge: abae113 a735202
Author: Alima777 <wx...@gmail.com>
AuthorDate: Wed Mar 17 17:33:56 2021 +0800

    Fix conflicts with master