Commit34af025

committed

Merge branch 'master' into REL_2_5

2 parentsfeacabd +4cde879 commit34af025Copy full SHA for 34af025

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -130,10 +130,10 @@ build/test_suse: build/test_suse_15.1 build/test_suse_15.2`
`130`	`130`	`@echo Suse: done`
`131`	`131`
`132`	`132`	`build/test_suse_15.1: build/test_suse_15.1_9.6 build/test_suse_15.1_10 build/test_suse_15.1_11 build/test_suse_15.1_12 build/test_suse_15.1_13`
`133`		`-@echoRhel 15.1: done`
	`133`	`+@echoSuse 15.1: done`
`134`	`134`
`135`	`135`	`build/test_suse_15.2: build/test_suse_15.2_9.6 build/test_suse_15.2_10 build/test_suse_15.2_11 build/test_suse_15.2_12 build/test_suse_15.2_13 build/test_suse_15.2_14`
`136`		`-@echoRhel 15.1: done`
	`136`	`+@echoSuse 15.2: done`
`137`	`137`
`138`	`138`	`define test_suse`
`139`	`139`	`docker rm -f $1_$2_probackup_$(PKG_NAME_SUFFIX)$(PBK_VERSION) >> /dev/null 2>&1 ; \`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,12 @@ if [ ${DISTRIB} == 'centos' ] && [ ${DISTRIB_VERSION} == '8' ]; then`
`77`	`77`	`dnf -qy module disable postgresql`
`78`	`78`	`fi`
`79`	`79`
	`80`	`+# PGDG doesn't support install of PG-9.6 from repo package anymore`
	`81`	`+if [${PG_VERSION}=='9.6' ]&& [${DISTRIB_VERSION}=='7' ];then`
	`82`	`+# ugly hack: use repo settings from PG10`
	`83`	`+ sed -i's/10/9.6/' /etc/yum.repos.d/pgdg-redhat-all.repo`
	`84`	`+fi`
	`85`	`+`
`80`	`86`	`yum install -y postgresql${PG_TOG}-server.x86_64`
`81`	`87`	`export PGDATA=/var/lib/pgsql/${PG_VERSION}/data`
`82`	`88`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ typedef enum ShowFormat`
`345`	`345`	#defineBYTES_INVALID(-1)/* file didn`t changed since previous backup, DELTA backup do not rely on it */
`346`	`346`	`#defineFILE_NOT_FOUND(-2)/* file disappeared during backup */`
`347`	`347`	`#defineBLOCKNUM_INVALID(-1)`
`348`		`-#definePROGRAM_VERSION"2.5.8"`
	`348`	`+#definePROGRAM_VERSION"2.5.9"`
`349`	`349`
`350`	`350`	`/* update when remote agent API or behaviour changes */`
`351`	`351`	`#defineAGENT_PROTOCOL_VERSION 20509`

Comments

(0)