iterative merge: Initial plumbing for merge subproject #2968
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: garyschulte <garyschulte@gmail.com>
…lve odd maven collision Signed-off-by: garyschulte <garyschulte@gmail.com>
garyschulte
force-pushed
the
feature/mergeOptions
branch
from
7bf43e1 to
a5d6a9a
Compare
garyschulte
changed the title
garyschulte
force-pushed
the
feature/mergeOptions
branch
4 times, most recently
from
1e853fe to
9907565
Compare
Signed-off-by: garyschulte <garyschulte@gmail.com>
garyschulte
force-pushed
the
feature/mergeOptions
branch
from
9907565 to
0e70ebd
Compare
fab-10
approved these changes
Oct 28, 2021
| @Option( | ||
| hidden = true, | ||
| names = {"--Xmerge-support"}, | ||
| description = "Enable experimental support for eth1/eth2 merge (default: ${DEFAULT-VALUE})", |
There was a problem hiding this comment.
How ${DEFAULT-VALUE} is set?
There was a problem hiding this comment.
it is the initial value of the static field the annotation is on:
https://picocli.info/apidocs/picocli/CommandLine.Option.html#description--
|
Kudos, SonarCloud Quality Gate passed! |
jflo
approved these changes
Oct 28, 2021
| @@ -0,0 +1,19 @@ | |||
| /* | |||
| * Copyright ConsenSys AG. | |||
There was a problem hiding this comment.
New files should be copyright Hyperledger Besu Contributors.
There was a problem hiding this comment.
whoops! will address in the next merge pr. I have just been finding a peer file and blanket copying the header. I didn't realize we had two different attributions
frankisawesome
pushed a commit
to frankisawesome/besu
that referenced
this pull request
Oct 31, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: garyschulte garyschulte@gmail.com
PR description
This is step one of an iterative merge of the amphora feature branch into main.
highlights include:
Fixed Issue(s)
fixes #2966
Changelog