Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master branch into HDDS-1880-Decom #1568

Merged
merged 24 commits into from
Nov 11, 2020

Conversation

sodonnel
Copy link
Contributor

What changes were proposed in this pull request?

Merge the master branch into HDDS-1880-Decom.

There was only 1 minor conflict in SCMBlockDeletingService.java/

What is the link to the Apache JIRA

No apache Jira

Existing unit tests.

adoroszlai and others added 24 commits October 26, 2020 14:25
…ent. (apache#1498)

Co-authored-by: Li Cheng <timmycheng@tencent.com>
Co-authored-by: Bharat Viswanadham <bviswanadham@cloudera.com>
Co-authored-by: Doroszlai, Attila <6454655+adoroszlai@users.noreply.github.com>
@sodonnel sodonnel changed the title Decom merge master nov 10 Merge master branch into HDDS-1880-Decom Nov 11, 2020
Copy link
Member

@elek elek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1, thanks the work.

@asfgit asfgit merged commit 4c5f21b into apache:HDDS-1880-Decom Nov 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.