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

avijayan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git

commit 5af5a337c19d981d84e91521a9b9c979154875a6
Merge: 240af4d dba2d54
Author: Aravindan Vijayan <[email protected]>
AuthorDate: Sun Jul 11 21:36:47 2021 -0700

    Merge remote-tracking branch 'ssh-upstream/master' into 
ssh-upstream-upgrade-branch

 .../apache/hadoop/hdds/scm/pipeline/Pipeline.java  |   4 +-
 .../ozone/container/common/impl/ContainerData.java |   2 +
 hadoop-hdds/server-scm/pom.xml                     |  21 +++
 .../hdds/scm/container/ReplicationManager.java     |  10 +-
 .../hdds/scm/server/StorageContainerManager.java   |   5 +-
 .../hdds/scm/pipeline/TestSCMPipelineManager.java  | 157 ++++++++++-----------
 6 files changed, 111 insertions(+), 88 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to