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 horizon v2.15.1 release branch back to master #4258

Merged
merged 4 commits into from
Mar 4, 2022

Conversation

paulbellamy
Copy link
Contributor

PR Checklist

PR Structure

  • This PR has reasonably narrow scope (if not, break it down into smaller PRs).
  • This PR avoids mixing refactoring changes with feature changes (split into two PRs
    otherwise).
  • This PR's title starts with name of package that is most changed in the PR, ex.
    services/friendbot, or all or doc if the changes are broad or impact many
    packages.

Thoroughness

  • This PR adds tests for the most critical parts of the new functionality or fixes.
  • I've updated any docs (developer docs, .md
    files, etc... affected by this change). Take a look in the docs folder for a given service,
    like this one.

Release planning

  • I've updated the relevant CHANGELOG (here for Horizon) if
    needed with deprecations, added features, breaking changes, and DB schema changes.
  • I've decided if this PR requires a new major/minor version according to
    semver, or if it's mainly a patch change. The PR is targeted at the next
    release branch if it's not a patch change.

What

Merge 2.15.1 back into master

Why

Because it is released now.

Known limitations

[TODO or N/A]

bartekn and others added 4 commits March 1, 2022 01:20
This commit revers LedgerHashStore removed from Horizon's CaptiveCoreConfig in:
b7fde58. This change makes it impossible to PrepareRange using Captive-Core if
there is any other ingestion instance running because CaptiveCoreBackend tries
to load the hash of the ledger from archives when LedgerHashStore is not set.
But ledgers are published every 5 minutes so they contain the hash of the latest
ledger only for a brief amount of time (the moment when checkpoint is
published).
@paulbellamy paulbellamy enabled auto-merge March 4, 2022 15:44
Copy link
Contributor

@sreuland sreuland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks @paulbellamy !

@paulbellamy paulbellamy merged commit 697ab03 into master Mar 4, 2022
@paulbellamy paulbellamy deleted the release-horizon-v2.15.1 branch March 7, 2022 13:43
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.

3 participants