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 c960ec7c5af8bc1a0277675978db7389439e28c3 Merge: 9c4008d ad790b6 Author: Elek Márton <[email protected]> AuthorDate: Wed Jun 2 11:35:51 2021 +0200 Merge remote-tracking branch 'origin/HDDS-3816-ec' into HDDS-3816-ec .../hadoop/hdds/scm/storage/BlockOutputStream.java | 5 +- .../hdds/scm/storage/ContainerProtocolCalls.java | 20 ++++++-- .../java/org/apache/hadoop/ozone/OzoneConsts.java | 1 + .../container/common/helpers/ContainerUtils.java | 5 +- .../container/common/impl/ContainerDataYaml.java | 55 ++++++++++++++++------ .../container/common/impl/HddsDispatcher.java | 5 ++ .../container/keyvalue/KeyValueContainer.java | 1 + .../container/keyvalue/KeyValueContainerData.java | 10 ++++ .../ozone/container/keyvalue/KeyValueHandler.java | 2 + .../ozone/container/ozoneimpl/ContainerReader.java | 4 +- .../TestSchemaOneBackwardsCompatibility.java | 3 +- .../common/impl/TestContainerDataYaml.java | 48 +++++++++++++++++-- 12 files changed, 129 insertions(+), 30 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
