8000 Fix conflicts between v1.12.0 dev and master in advance by blukat29 · Pull Request #2041 · klaytn/klaytn · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Aug 19, 2024. It is now read-only.

Fix conflicts between v1.12.0 dev and master in advance #2041

Merged
merged 11 commits into from
Nov 21, 2023
Merged

Fix conflicts between v1.12.0 dev and master in advance #2041

merged 11 commits into from
Nov 21, 2023

Conversation

blukat29
Copy link
Contributor
@blukat29 blukat29 commented Nov 21, 2023 •
edited by Sotatek-TinnNguyen
Loading

Proposed changes

Fix potential merge conflicts with master in advance 0c82fd6:

  • params/version.go
  • params/config.go

Types of changes

  • Bugfix
  • New feature or enhancement
  • Others

Checklist

  • I have read the CONTRIBUTING GUIDELINES doc
  • I have signed the CLA
  • Lint and unit tests pass locally with my changes ($ make test)
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)
  • Any dependent changes have been merged and published in downstream modules

Related issues

Further comments

aidan-kwon and others added 10 commits March 17, 2023 18:18
@aidan-kwon
Merge pull request klaytn#1801 from klaytn/release/v1.10.2
2dc0b65 
[Master] release/v1.10.2 QA Sign-off
@aidan-kwon
Merge pull request klaytn#1908 from klaytn/release/v1.11.0
6e6535a 
[Master] release/v1.11.0 QA Sign-off
@aidan-kwon @blukat29
Merge pull request klaytn#1945 from aidan-kwon/230823-fixConsensusInfo
36a1117 
Fix nil pointer dereference during GetConsensusInfo API execution
@blukat29
Merge pull request klaytn#1949 from jeongkyun-oh/230828-add-nochainre…
3e9b81a 
…ader
@blukat29
Merge pull request klaytn#1962 from ian0371/rocksdb-flag-alias
54e442b
@blukat29
Merge pull request klaytn#1963 from kjeom/bugfix-recoverFromMessage
5638d4e
@blukat29
Merge pull request klaytn#1959 from blukat29/shanghai-cypress-hardfor…
497aaf8 
…k-blocknumber
@blukat29
Merge pull request klaytn#1960 from blukat29/version-v1.11.1
53faf74
@blukat29
Merge pull request klaytn#1964 from klaytn/release/v1.11.1
b131aec
@blukat29
Merge branch 'dev' into v1.12.0-fix-conflict
0c82fd6
@blukat29 blukat29 self-assigned this Nov 21, 2023
ian0371
ian0371 previously approved these changes Nov 21, 2023
View reviewed changes
2dvorak
2dvorak previously approved these changes Nov 21, 2023
View reviewed changes
@blukat29 blukat29 changed the title Prepare merge dev into master for v1.12.0 Fix conflicts between v1.12.0 dev and master in advance Nov 21, 2023
yoomee1313
yoomee1313 previously approved these changes Nov 21, 2023
View reviewed changes
@blukat29
Copy link
Contributor Author

I have read the CLA Document and I hereby sign the CLA

@blukat29 blukat29 dismissed stale reviews from yoomee1313, 2dvorak, and ian0371 via 6a08b6d November 21, 2023 02:42
@blukat29 blukat29 requested a review from yoomee1313 November 21, 2023 03:03
@blukat29 blukat29 merged commit 4943f73 into klaytn:dev Nov 21, 2023
@blukat29 blukat29 deleted the v1.12.0-fix-conflict branch January 19, 2024 09:05
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ian0371 ian0371 ian0371 approved these changes

@2dvorak 2dvorak 2dvorak approved these changes

@yoomee1313 yoomee1313 yoomee1313 approved these changes

@aidan-kwon aidan-kwon Awaiting requested review from aidan-kwon aidan-kwon is a code owner

Assignees

@blukat29 blukat29

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@blukat29 @ian0371 @2dvorak @yoomee1313 @aidan-kwon
0