Skip to content

Commit 9acc12b

Browse files
dmpgprodmpgpro
committed
Merge branch 'PGPRO9_6' into PGPRO9_6_1C
2 parents ea1eb36 + 0cca685 commit 9acc12b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+6259
-4873
lines changed

‎contrib/pg_probackup/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
/env
2929
/tests/__pycache__/
3030
/tests/tmp_dirs/
31+
/tests/*pyc
3132

3233
# Extra files
3334
/datapagemap.c

‎contrib/pg_probackup/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
PROGRAM = pg_probackup
22
OBJS = backup.o \
33
catalog.o \
4+
configure.o \
45
data.o \
56
delete.o \
67
dir.o \
78
fetch.o \
9+
help.o \
810
init.o \
911
parray.o \
1012
pg_probackup.o \
@@ -18,9 +20,7 @@ OBJS = backup.o \
1820
xlogreader.o \
1921
streamutil.o \
2022
receivelog.o \
21-
pgut/pgut.o \
22-
pgut/pgut-port.o \
23-
pgut/getopt_long.o
23+
pgut/pgut.o
2424

2525
EXTRA_CLEAN = datapagemap.c datapagemap.h xlogreader.c receivelog.c receivelog.h streamutil.c streamutil.h logging.h
2626

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy