Merge branch 'repprotocol_v1' of https://git.postgrespro.ru/pgpro-dev/pg_probackup into repprotocol_v1

gsmolk · gsmolk · commit 31b7230ea729 · 2017-10-03T16:27:29.000+03:00
diff --git a/src/pg_probackup.c b/src/pg_probackup.c
@@ -17,7 +17,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-const char *PROGRAM_VERSION	= "2.0.4";
+const char *PROGRAM_VERSION	= "2.0.5";
 const char *PROGRAM_URL		= "https://github.com/postgrespro/pg_probackup";
 const char *PROGRAM_EMAIL	= "https://github.com/postgrespro/pg_probackup/issues";
 
@@ -119,7 +119,8 @@ static pgut_option options[] =
 	{ 's', 15, "master-port",			&master_port,		SOURCE_CMDLINE, },
 	{ 's', 16, "master-user",			&master_user,		SOURCE_CMDLINE, },
 	{ 'u', 17, "replica-timeout",		&replica_timeout,	SOURCE_CMDLINE, },
-	{ 'b', 18, "remote",				&is_remote_backup,	SOURCE_CMDLINE, },
+	/* TODO not completed feature. Make it unavailiable from user level
+	 { 'b', 18, "remote",				&is_remote_backup,	SOURCE_CMDLINE, }, */
 	/* restore options */
 	{ 's', 20, "time",					&target_time,		SOURCE_CMDLINE },
 	{ 's', 21, "xid",					&target_xid,		SOURCE_CMDLINE },
diff --git a/tests/expected/option_version.out b/tests/expected/option_version.out
@@ -1 +1 @@
-pg_probackup 2.0.4
+pg_probackup 2.0.5
