File tree Expand file tree Collapse file tree 2 files changed +6
-1
lines changed
files/admin_api_scripts/pg_upgrade_scripts Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -429,7 +429,6 @@ $(cat /etc/postgresql/pg_hba.conf)" > /etc/postgresql/pg_hba.conf
429
429
--old-options="-c shared_preload_libraries='${SHARED_PRELOAD_LIBRARIES} '" \
430
430
--new-options="-c data_directory=${PGDATANEW} " \
431
431
--new-options="-c shared_preload_libraries='${SHARED_PRELOAD_LIBRARIES} '" \
432
- --new-options='-c config_file=${TEMP_POSTGRES_CONFIG_PATH} ' \
433
432
--new-options="-c max_slot_wal_keep_size=-1"
434
433
EOF
435
434
)
Original file line number Diff line number Diff line change @@ -9,9 +9,15 @@ postgres_major:
9
9
10
10
# Full version strings for each major version
11
11
postgres_release :
12
+ <<<<<<< HEAD
12
13
postgresorioledb-17 : " 17.0.1.079-orioledb-pgup-1"
13
14
postgres17 : " 17.4.1.029-pgup-1"
14
15
postgres15 : " 15.8.1.086-pgup-1"
16
+ =======
17
+ postgresorioledb-17 : " 17.0.1.078-orioledb-upgrade-8"
18
+ postgres17 : " 17.4.1.028-upgrade-8"
19
+ postgres15 : " 15.8.1.085-upgrade-8"
20
+ >>>>>>> 1ca84730 (fix: remove unbound var)
15
21
16
22
# Non Postgres Extensions
17
23
pgbouncer_release : " 1.19.0"
You can’t perform that action at this time.
0 commit comments