Merge master into soroban soroban-xdr-next #4990
Merged
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
Bumps [golang.org/x/text](https://github.com/golang/text) from 0.3.7 to 0.3.8. - [Release notes](https://github.com/golang/text/releases) - [Commits](golang/text@v0.3.7...v0.3.8) --- updated-dependencies: - dependency-name: golang.org/x/text dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Bump core image to latest stable release v19.10.0
Suppress Core timeout error when ingestion state machine is in build state.
…ent race condition. (stellar#4889)
…tellar#4877) * 4856: Update default for --captive-core-use-db to true * Update CHANGELOG.md
…t-tx-ledger Parse LIMIT_TX_QUEUE_SOURCE_ACCOUNT in core config
Pinning and updating golang and ubuntu images
Merge 2.26.0 changelog notes
* tools/goreplay-middleware: Add goreplay middleware * Fix linter errors --------- Co-authored-by: Bartek Nowotarski <bartek@nowotarski.info>
* all: Fix improper use of errors.Wrap `errors.Wrap` method returns nil if the first argument passed is also nil. If `errors.Wrap` is copied from a condition like `if err != nil` to another one which also returns `errors.Wrap` but does not overwrite `err` before the returned value will always be `nil`. * Update services/horizon/internal/db2/history/claimable_balances.go Co-authored-by: George <Shaptic@users.noreply.github.com> --------- Co-authored-by: George <Shaptic@users.noreply.github.com> Co-authored-by: Tsachi Herman <24438559+tsachiherman@users.noreply.github.com>
…lang.org/x/text-0.3.8 Bump golang.org/x/text from 0.3.7 to 0.3.8
…er (stellar#4956) The default value of STELLAR_CORE_URL (localhost:11626) in standalone network mode doesn't work. We need to explictly set STELLAR_CORE_URL to http://host.docker.internal:11626, to allow Horizon to access the host container's port to connect with the core container.
…ering-flag Add functionality to hide ingestion enabled flag from --help output
…n is in build state (stellar#4977)
…t version of libc++ (stellar#4986)
tamirms
approved these changes
Jul 28, 2023
tamirms
reviewed
Jul 28, 2023
tamirms
reviewed
Jul 28, 2023
2opremio
force-pushed
the
merge-master-xdr-next
branch
from
24a7b37 to
43541de
Compare
|
@tamirms I amended and force-pushed the merge. PTAL |
|
Also, I changed the base branch. It was master and it should had been |
tamirms
approved these changes
Jul 28, 2023
Update command_line_args_test.go Remove command_line_args_test.go
tsachiherman
approved these changes
Jul 28, 2023
|
Why did you merge? It contains a change I cherry-picked for testing. Let's please let posters merge (unless they say otherwise). |
|
@tsachiherman Reverting, since the commits where squashed instead of merged. Causing a million conflicts when merging master again. |
2opremio
added a commit
that referenced
this pull request
Jul 28, 2023
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.
I needed this because of #4986 , but a merge was due anyways.