Commite90527d

committed

Merge branch 'master' into stable. Version 2.0.6.

2 parentsed8f9be +9813471 commite90527dCopy full SHA for e90527d

File tree

+1947

-1074

lines changed

+1947

-1074

lines changed

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,6 @@ do_archive_push(char wal_file_path, char wal_file_name)`
`54`	`54`	`"Instance '%s' should have SYSTEM_ID = %ld instead of %ld",`
`55`	`55`	`wal_file_name,instance_name,config->system_identifier,system_id);`
`56`	`56`
`57`		`-if (strcmp(current_dir,config->pgdata)!=0)`
`58`		`-elog(ERROR,"Refuse to push WAL segment %s into archive. Instance parameters mismatch."`
`59`		`-"Instance '%s' should have PGDATA = %s instead of %s",`
`60`		`-wal_file_name,instance_name,config->pgdata,current_dir);`
`61`		`-`
`62`	`57`	`/* Create 'archlog_path' directory. Do nothing if it already exists. */`
`63`	`58`	`dir_create_dir(arclog_path,DIR_PERMISSION);`
`64`	`59`
`@@ -106,4 +101,4 @@ do_archive_get(char wal_file_path, char wal_file_name)`
`106`	`101`	`elog(INFO,"pg_probackup archive-get completed successfully");`
`107`	`102`
`108`	`103`	`return0;`
`109`		`-}`
	`104`	`+}`

Comments

(0)