db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2024-11-28 09:33:54 +02:00
Code Issues Releases Activity

Merge branch 'master' into release_2_4

Browse Source
This commit is contained in:
Grigory Smolkin 2020-06-03 15:39:10 +03:00
commit 93f8291617
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/pgprobackup.xml
View File

@ -4310,7 +4310,7 @@ pg_probackup archive-get -B <replaceable>backup_dir</replaceable> --instance <re
<option>--recovery-target-lsn</option> or
<option>--recovery-target-xid</option> options. The default
depends on the
<ulink url="https://postgrespro.com/docs/postgresql/current/recovery-target-settings.html#RECOVERY-TARGET-INCLUSIVE">recovery_target_inclusive</ulink>
<ulink url="https://postgrespro.com/docs/postgresql/current/runtime-config-wal#GUC-RECOVERY-TARGET-INCLUSIVE">recovery_target_inclusive</ulink>
parameter.
</para>
</listitem>

2
tests/replica.py
View File

@ -726,7 +726,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
log_content)
self.assertIn(
'LOG: current.stop_lsn: 0/4000028',
'LOG: stop_lsn: 0/4000028',
log_content)
# Clean after yourself