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 develop branch into hardfork branch #2563

Merged
merged 26 commits into from
Dec 17, 2021
Merged

Conversation

abitmore
Copy link
Member

Note: the branch is forked from develop and updated SonarScanner config with a new commit.

abitmore and others added 26 commits October 25, 2021 01:27
Merge hardfork branch into release branch for 6.0 release
Update sonar.branch.target in release branch
Merge hardfork branch into release branch
Merge hardfork branch into release branch
Merge hardfork branch into release branch
Merge hardfork branch into release branch
Set Mainnet 6.0 HF time to 2022-01-11 14:02:00 UTC
Merge release branch back into develop branch
Fix ES plugin by inserting maps as strings
Update version in Doxyfile and bump docs submodule
Merge release branch back into develop branch
@sonarcloud
Copy link

sonarcloud bot commented Dec 17, 2021

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@abitmore abitmore merged commit 5550b40 into hardfork Dec 17, 2021
@abitmore abitmore deleted the develop-to-hardfork branch December 17, 2021 14:29
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.

2 participants