Merge branch 'master' into REL_2_5

funny-falcon · funny-falcon · commit 5f66a60a814e · 2022-11-15T15:03:55.000+03:00
diff --git a/src/pg_probackup.h b/src/pg_probackup.h
@@ -345,7 +345,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.9"
+#define PROGRAM_VERSION	"2.5.10"
 
 /* update when remote agent API or behaviour changes */
 #define AGENT_PROTOCOL_VERSION 20509
diff --git a/tests/expected/option_version.out b/tests/expected/option_version.out
@@ -1 +1 @@
-pg_probackup 2.5.9
+pg_probackup 2.5.10
