Skip to content

Merge master into HDDS-3698-nonrolling-upgrade#2121

Closed
errose28 wants to merge 5 commits intoapache:HDDS-3698-nonrolling-upgradefrom
errose28:HDDS-3698-nonrolling-upgrade
Closed

Merge master into HDDS-3698-nonrolling-upgrade#2121
errose28 wants to merge 5 commits intoapache:HDDS-3698-nonrolling-upgradefrom
errose28:HDDS-3698-nonrolling-upgrade

Conversation

@errose28
Copy link
Contributor

@errose28 errose28 commented Apr 6, 2021

What changes were proposed in this pull request?

Merge in master to get HDDS-5066 and fix builds on upgrade branch.

What is the link to the Apache JIRA

N/A

How was this patch tested?

Existing CI

aryangupta1998 and others added 5 commits April 5, 2021 13:37
* master:
  HDDS-5066. Use fixed vesion from pnpm to build recon (apache#2115)
  HDDS-5035. Use default config values to solve generated config file conflict (apache#2087)
  HDDS-5032. DN stopped to load containers on volume after a container load exception. (apache#2109)
  HDDS-4504. Datanode deletion config should be based on number of blocks (apache#1885)
@avijayanhwx
Copy link
Contributor

Thanks for the merge PR @errose28. I have manually merged the branch. Closing this.

@avijayanhwx avijayanhwx closed this Apr 6, 2021
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.

6 participants