Merge branch 'REL_2_5'

Author: funny-falcon

doc/pgprobackup.xml

@@ -558,7 +558,7 @@ backup_user@backup_host:~$ pg_probackup backup \
     --remote-user=postgres \
     -U backup \
     -d backupdb
-INFO: Backup start, pg_probackup version: 2.5.14, instance: node, backup ID: SCUN1Q, backup mode: FULL, wal mode: STREAM, remote: true, compress-algorithm: zlib, compress-level: 1
+INFO: Backup start, pg_probackup version: 2.5.15, instance: node, backup ID: SCUN1Q, backup mode: FULL, wal mode: STREAM, remote: true, compress-algorithm: zlib, compress-level: 1
 INFO: This PostgreSQL instance was initialized with data block checksums. Data block corruption will be detected
 INFO: Database backup start
 INFO: wait for pg_backup_start()
@@ -604,7 +604,7 @@ backup_user@backup_host:~$ pg_probackup backup \
             --remote-user=postgres \
             -U backup \
             -d backupdb
-INFO: Backup start, pg_probackup version: 2.5.14, instance: node, backup ID: SCUN22, backup mode: DELTA, wal mode: STREAM, remote: true, compress-algorithm: zlib, compress-level: 1
+INFO: Backup start, pg_probackup version: 2.5.15, instance: node, backup ID: SCUN22, backup mode: DELTA, wal mode: STREAM, remote: true, compress-algorithm: zlib, compress-level: 1
 INFO: This PostgreSQL instance was initialized with data block checksums. Data block corruption will be detected
 INFO: Database backup start
 INFO: wait for pg_backup_start()
@@ -692,7 +692,7 @@ backup_user@backup_host:~$ pg_probackup backup \
         --instance=node \
         --stream \
         --compress-algorithm=zlib
-INFO: Backup start, pg_probackup version: 2.5.14, instance: node, backup ID: SCUN2C, backup mode: DELTA, wal mode: STREAM, remote: true, compress-algorithm: zlib, compress-level: 1
+INFO: Backup start, pg_probackup version: 2.5.15, instance: node, backup ID: SCUN2C, backup mode: DELTA, wal mode: STREAM, remote: true, compress-algorithm: zlib, compress-level: 1
 INFO: This PostgreSQL instance was initialized with data block checksums. Data block corruption will be detected
 INFO: Database backup start
 INFO: wait for pg_backup_start()
@@ -2989,7 +2989,7 @@ from-replica = false
 block-size = 8192
 xlog-block-size = 8192
 checksum-version = 1
-program-version = 2.5.14
+program-version = 2.5.15
 server-version = 16
 
 #Result backup info
@@ -3135,7 +3135,7 @@ pg_probackup show -B <replaceable>backup_dir</replaceable> --instance=<replaceab
                 "block-size": 8192,
                 "xlog-block-size": 8192,
                 "checksum-version": 1,
-                "program-version": "2.5.14",
+                "program-version": "2.5.15",
                 "server-version": "16",
                 "current-tli": 16,
                 "parent-tli": 2,
@@ -3294,7 +3294,7 @@ pg_probackup show -B <replaceable>backup_dir</replaceable> [--instance=<replacea
                         "block-size": 8192,
                         "xlog-block-size": 8192,
                         "checksum-version": 1,
-                        "program-version": "2.5.14",
+                        "program-version": "2.5.15",
                         "server-version": "16",
                         "current-tli": 1,
                         "parent-tli": 0,
@@ -3323,7 +3323,7 @@ pg_probackup show -B <replaceable>backup_dir</replaceable> [--instance=<replacea
                         "block-size": 8192,
                         "xlog-block-size": 8192,
                         "checksum-version": 1,
-                        "program-version": "2.5.14",
+                        "program-version": "2.5.15",
                         "server-version": "16",
                         "current-tli": 1,
                         "parent-tli": 1,
@@ -3352,7 +3352,7 @@ pg_probackup show -B <replaceable>backup_dir</replaceable> [--instance=<replacea
                         "block-size": 8192,
                         "xlog-block-size": 8192,
                         "checksum-version": 1,
-                        "program-version": "2.5.14",
+                        "program-version": "2.5.15",
                         "server-version": "16",
                         "current-tli": 1,
                         "parent-tli": 1,
@@ -3381,7 +3381,7 @@ pg_probackup show -B <replaceable>backup_dir</replaceable> [--instance=<replacea
                         "block-size": 8192,
                         "xlog-block-size": 8192,
                         "checksum-version": 1,
-                        "program-version": "2.5.14",
+                        "program-version": "2.5.15",
                         "server-version": "16",
                         "current-tli": 1,
                         "parent-tli": 1,
@@ -3409,7 +3409,7 @@ pg_probackup show -B <replaceable>backup_dir</replaceable> [--instance=<replacea
                         "block-size": 8192,
                         "xlog-block-size": 8192,
                         "checksum-version": 1,
-                        "program-version": "2.5.14",
+                        "program-version": "2.5.15",
                         "server-version": "16",
                         "current-tli": 1,
                         "parent-tli": 0,

src/pg_probackup.h

@@ -356,7 +356,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.14"
+#define PROGRAM_VERSION	"2.5.15"
 
 /* update when remote agent API or behaviour changes */
 #define AGENT_PROTOCOL_VERSION 20509