Merge branch 'REL_2_6' into REL_2_6-PBCKP-256

Author: kulaginm

src/catalog.c

@@ -1091,15 +1091,15 @@ get_backup_filelist(pgBackup *backup, bool strict)
 
 		COMP_CRC32C(content_crc, buf, strlen(buf));
 
-        get_control_value_str(buf, "path", path, sizeof(path),true);
-        get_control_value_int64(buf, "size", &write_size, true);
-        get_control_value_int64(buf, "mode", &mode, true);
-        get_control_value_int64(buf, "is_datafile", &is_datafile, true);
-        get_control_value_int64(buf, "is_cfs", &is_cfs, false);
-        get_control_value_int64(buf, "crc", &crc, true);
-        get_control_value_str(buf, "compress_alg", compress_alg_string, sizeof(compress_alg_string), false);
-        get_control_value_int64(buf, "external_dir_num", &external_dir_num, false);
-        get_control_value_int64(buf, "dbOid", &dbOid, false);
+		get_control_value_str(buf, "path", path, sizeof(path),true);
+		get_control_value_int64(buf, "size", &write_size, true);
+		get_control_value_int64(buf, "mode", &mode, true);
+		get_control_value_int64(buf, "is_datafile", &is_datafile, true);
+		get_control_value_int64(buf, "is_cfs", &is_cfs, false);
+		get_control_value_int64(buf, "crc", &crc, true);
+		get_control_value_str(buf, "compress_alg", compress_alg_string, sizeof(compress_alg_string), false);
+		get_control_value_int64(buf, "external_dir_num", &external_dir_num, false);
+		get_control_value_int64(buf, "dbOid", &dbOid, false);
 
 		file = pgFileInit(path);
 		file->write_size = (int64) write_size;

src/pg_probackup.h

@@ -88,7 +88,6 @@ extern const char  *PROGRAM_EMAIL;
 
 /* Timeout defaults */
 #define ARCHIVE_TIMEOUT_DEFAULT		300
-#define REPLICA_TIMEOUT_DEFAULT		300
 #define LOCK_TIMEOUT				60
 #define LOCK_STALE_TIMEOUT			30
 #define LOG_FREQ					10
@@ -308,7 +307,7 @@ typedef enum ShowFormat
 #define BYTES_INVALID		(-1) /* file didn`t changed since previous backup, DELTA backup do not rely on it */
 #define FILE_NOT_FOUND		(-2) /* file disappeared during backup */
 #define BLOCKNUM_INVALID	(-1)
-#define PROGRAM_VERSION	"2.5.7"
+#define PROGRAM_VERSION	"2.6.0"
 
 /* update when remote agent API or behaviour changes */
 #define AGENT_PROTOCOL_VERSION 20600

src/validate.c

@@ -67,9 +67,9 @@ pgBackupValidate(pgBackup *backup, pgRestoreParams *params)
 
 	/* Check backup server version */
 	if (strcmp(backup->server_version, PG_MAJORVERSION) != 0)
-        elog(ERROR, "Backup %s has server version %s, but current pg_probackup binary "
+		elog(ERROR, "Backup %s has server version %s, but current pg_probackup binary "
 					"compiled with server version %s",
-                base36enc(backup->start_time), backup->server_version, PG_MAJORVERSION);
+			base36enc(backup->start_time), backup->server_version, PG_MAJORVERSION);
 
 	if (backup->status == BACKUP_STATUS_RUNNING)
 	{

tests/expected/option_version.out

@@ -1 +1 @@
-pg_probackup 2.5.7
+pg_probackup 2.6.0