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 2023/05/23 13:12:17 UTC

[iotdb] 05/05: Merge branch 'tiered_storage' of github.com:apache/iotdb into tiered_storage

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

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

commit 860676869b33794b1be52199ae5cb44ebca917fe
Merge: d263283d704 4cdd85feb9a
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Tue May 23 21:11:53 2023 +0800

    Merge branch 'tiered_storage' of github.com:apache/iotdb into tiered_storage

 .../java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java | 5 +++++
 .../main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java  | 4 +++-
 tsfile/src/main/java/org/apache/iotdb/tsfile/utils/FSUtils.java      | 4 ++++
 .../src/main/java/org/apache/iotdb/tsfile/utils/FilePathUtils.java   | 5 +++++
 4 files changed, 17 insertions(+), 1 deletion(-)