Skip to content

Commit eb157ee

Browse files
vbwagnervbwagner
committed
Fix conflict on merge
2 parents e1f8df4 + f7389cd commit eb157ee

File tree

224 files changed

+9038
-2455
lines changed

Some content is hidden

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

224 files changed

+9038
-2455
lines changed

‎.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,9 @@ lib*.pc
3838
/Debug/
3939
/Release/
4040
/tmp_install/
41+
42+
# Contrib
43+
/contrib/*/log/
44+
/contrib/*/results/
45+
/contrib/*/tmp_check/
46+
/contrib/pg_query_state/isolation_output/

‎configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2754,7 +2754,7 @@ else
27542754
fi
27552755

27562756

2757-
PGPRO_VERSION="$PACKAGE_VERSION.1"
2757+
PGPRO_VERSION="$PACKAGE_VERSION.2"
27582758
PGPRO_PACKAGE_NAME="PostgresPro"
27592759
PGPRO_EDITION="enterprise"
27602760

‎configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ AC_DEFINE_UNQUOTED(PG_MAJORVERSION, "$PG_MAJORVERSION", [PostgreSQL major versio
3838
PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
3939
[PG_VERSION="$PACKAGE_VERSION$withval"],
4040
[PG_VERSION="$PACKAGE_VERSION"])
41-
PGPRO_VERSION="$PACKAGE_VERSION.1"
41+
PGPRO_VERSION="$PACKAGE_VERSION.2"
4242
PGPRO_PACKAGE_NAME="PostgresPro"
4343
PGPRO_EDITION="enterprise"
4444
AC_SUBST(PGPRO_PACKAGE_NAME)

‎contrib/Makefile

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,15 @@ SUBDIRS = \
6060
pg_variables \
6161
jsquery \
6262
sr_plan \
63-
pg_arman \
63+
pg_probackup \
6464
pg_pathman \
6565
shared_ispell \
66+
vacuumlo \
6667
pg_hint_plan \
67-
vacuumlo \
68-
mchar \
69-
fulleq \
70-
fasttrun \
71-
online_analyze \
72-
plantuner
68+
fulleq \
69+
fasttrun \
70+
online_analyze \
71+
plantuner
7372

7473
ifeq ($(with_openssl),yes)
7574
SUBDIRS += sslinfo
@@ -107,6 +106,12 @@ else
107106
ALWAYS_SUBDIRS += hstore_plpython ltree_plpython
108107
endif
109108

109+
ifeq ($(with_icu),yes)
110+
SUBDIRS += mchar
111+
else
112+
ALWAYS_SUBDIRS += mchar
113+
endif
114+
110115
# Missing:
111116
# start-scripts \ (does not have a makefile)
112117

0 commit comments

Comments
 (0)