Merge back release 2.1 #491
Merged
Conversation
This file contains hidden or 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
We want to pick up all bugixes between PostgreSQL 17.6 and 17.7. The
process to create this commit is documented below.
In PSP repo:
git checkout REL_17_7
In pg_tde repo:
git checkout -b fetmp17.7 main
tools/copy_fetools.sh ../postgresql 17
git add fetools/pg17
git commit -m REL_17_7
git checkout -b newbranch main
git diff 662d656 fetmp17.7 -- fetools/pg17 | git apply -3
git commit
We want to pick up all bugfixes between PostgreSQL 18.0 and 18.1. The
process to create this commit is documented below.
In PSP repo:
git checkout REL_18_1
In pg_tde repo:
git checkout -b fetmp18.1 main
tools/copy_fetools.sh ../postgresql 18
git add fetools/pg18
git commit -m REL_18_1
git checkout -b newbranch main
git diff b5eecfc fetmp18.1 -- fetools/pg18 | git apply -3
git commit
Removed outdated KMS information in functions.md since we have a dedicated chapter for that and added links to the described functions in the topic for easier flow.
This PR updates the tool names we use for pg_tde WAL encryption with the new pg_tde_* prefix and fixes minor missing link issues. Renamed tool file names and TOC names as well, and improved cli-tools.md intro paragraph.
This PR adds chapter changes that were on main from percona#449.
This PR adds limitations mentions that point to new tool names for WAL encryption and an FAQ mentioning how logical replication works on subs using encryption data.
This PR adds the 2.1 release notes and includes the update to tool names notes to users
This PR just updates a small date in the RN for 2.1
This PR updates the date for the 2.1.0 pdf
This PR implements and updates the feedback form for better traffic tracking stats
This PR updates the 2.1 release notes to include support for namespaces in Vault and OpenBao
Conflicts: documentation/docs/how-to/backup-wal-enabled.md documentation/docs/install.md documentation/variables.yml
Codecov Report✅ All modified and coverable lines are covered by tests. ❌ Your project status has failed because the head coverage (59.67%) is below the target coverage (90.00%). You can increase the head coverage or adjust the target coverage. Additional details and impacted files@@ Coverage Diff @@
## main #491 +/- ##
=======================================
Coverage 59.67% 59.67%
=======================================
Files 67 67
Lines 10473 10473
Branches 1805 1805
=======================================
Hits 6250 6250
Misses 3528 3528
Partials 695 695
🚀 New features to boost your workflow:
|
Andriciuc
approved these changes
Dec 4, 2025
Collaborator
Andriciuc
left a comment
Andriciuc
left a comment
There was a problem hiding this comment.
LGTM! Just one comment to solve.
dutow
force-pushed
the
releasemergeback
branch
from
1047efd to
d0ca7a1
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
There were a few documentation merge conflicts, I resolved them in a separate commit