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

Posted to commits@ozone.apache.org by el...@apache.org on 2021/02/24 08:45:56 UTC

[ozone] 07/27: Merge branch 'HDDS-4395' into HEAD

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

elek pushed a commit to branch HDDS-3816-ec
in repository https://gitbox.apache.org/repos/asf/ozone.git

commit 82a6cf2a97443945c24bffe95bf239277e7c2b8a
Merge: e4f3784 5a3271d
Author: Elek Márton <el...@apache.org>
AuthorDate: Mon Jan 25 12:19:34 2021 +0100

    Merge branch 'HDDS-4395' into HEAD

 .../hadoop/hdds/scm/container/ContainerInfo.java   |  21 +-
 .../container/keyvalue/impl/BlockManagerImpl.java  |  61 +++--
 .../hdds/scm/container/ContainerReplica.java       |  13 +-
 .../hdds/scm/cli/ContainerOperationClient.java     |   9 +-
 .../dist/src/main/compose/upgrade/delete-data.sh   |  29 ++
 .../dist/src/main/compose/upgrade/generate-data.sh |  25 ++
 .../hadoop/ozone/om/OmMetadataManagerImpl.java     |   2 +-
 .../hadoop/ozone/freon/BaseFreonGenerator.java     |   8 +-
 .../java/org/apache/hadoop/ozone/freon/Freon.java  |   6 +
 .../freon/containergenerator/BaseGenerator.java    |  69 +++++
 .../containergenerator/GeneratorDatanode.java      | 303 +++++++++++++++++++++
 .../freon/containergenerator/GeneratorOm.java      | 250 +++++++++++++++++
 .../freon/containergenerator/GeneratorScm.java     |  92 +++++++
 .../freon/containergenerator/package-info.java     |  22 ++
 14 files changed, 867 insertions(+), 43 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org