Skip to content

Commit 2f9044b

Browse files
committed
fix: remove unbound var
1 parent 556baec commit 2f9044b

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,6 @@ $(cat /etc/postgresql/pg_hba.conf)" > /etc/postgresql/pg_hba.conf
429429
--old-options="-c shared_preload_libraries='${SHARED_PRELOAD_LIBRARIES}'" \
430430
--new-options="-c data_directory=${PGDATANEW}" \
431431
--new-options="-c shared_preload_libraries='${SHARED_PRELOAD_LIBRARIES}'" \
432-
--new-options='-c config_file=${TEMP_POSTGRES_CONFIG_PATH}' \
433432
--new-options="-c max_slot_wal_keep_size=-1"
434433
EOF
435434
)

ansible/vars.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,15 @@ postgres_major:
99

1010
# Full version strings for each major version
1111
postgres_release:
12+
<<<<<<< HEAD
1213
postgresorioledb-17: "17.0.1.079-orioledb-pgup-1"
1314
postgres17: "17.4.1.029-pgup-1"
1415
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)
1521

1622
# Non Postgres Extensions
1723
pgbouncer_release: "1.19.0"

0 commit comments

Comments
 (0)