diff --git a/doc/appendix-release-notes.xml b/doc/appendix-release-notes.xml
index d6aeaf77..ca7eee17 100644
--- a/doc/appendix-release-notes.xml
+++ b/doc/appendix-release-notes.xml
@@ -21,6 +21,30 @@
Release 4.5
?? ???, 2019
+
+ Compatibility changes
+
+ The following command line options, which have been deprecated since &repmgr; 3.3
+ (and which no longer had any effect other than to generate a warning about their use)
+ have been removed:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
General enhancements
diff --git a/repmgr-client.c b/repmgr-client.c
index 6ab11a8a..0a70c0a3 100644
--- a/repmgr-client.c
+++ b/repmgr-client.c
@@ -669,33 +669,20 @@ main(int argc, char **argv)
break;
/*-----------------------------
- * options deprecated since 3.3
+ * options deprecated since 4.0
*-----------------------------
*/
case OPT_CHECK_UPSTREAM_CONFIG:
item_list_append(&cli_warnings,
_("--check-upstream-config is deprecated; use --dry-run instead"));
break;
- case OPT_DATA_DIR:
- item_list_append(&cli_warnings,
- _("--data-dir is deprecated; use -D/--pgdata instead"));
- break;
- case OPT_NO_CONNINFO_PASSWORD:
- item_list_append(&cli_warnings,
- _("--no-conninfo-password is deprecated; use --use-recovery-conninfo-password to explicitly set a password"));
- break;
+
/* -C/--remote-config-file */
case 'C':
item_list_append(&cli_warnings,
_("--remote-config-file is no longer required"));
break;
- /* --recovery-min-apply-delay */
- case OPT_RECOVERY_MIN_APPLY_DELAY:
- item_list_append(&cli_warnings,
- _("--recovery-min-apply-delay is now a configuration file parameter, \"recovery_min_apply_delay\""));
- break;
-
case ':': /* missing option argument */
option_error_found = true;
break;
diff --git a/repmgr-client.h b/repmgr-client.h
index b2f9ee9a..8ca54744 100644
--- a/repmgr-client.h
+++ b/repmgr-client.h
@@ -101,13 +101,9 @@
#define OPT_DETAIL 1046
#define OPT_REPMGRD_FORCE_UNPAUSE 1047
-/* deprecated since 3.3 */
-#define OPT_DATA_DIR 999
-#define OPT_NO_CONNINFO_PASSWORD 998
-#define OPT_RECOVERY_MIN_APPLY_DELAY 997
/* deprecated since 4.0 */
-#define OPT_CHECK_UPSTREAM_CONFIG 996
-#define OPT_NODE 995
+#define OPT_CHECK_UPSTREAM_CONFIG 999
+#define OPT_NODE 998
static struct option long_options[] =
@@ -157,7 +153,6 @@ static struct option long_options[] =
{"copy-external-config-files", optional_argument, NULL, OPT_COPY_EXTERNAL_CONFIG_FILES},
{"fast-checkpoint", no_argument, NULL, 'c'},
{"no-upstream-connection", no_argument, NULL, OPT_NO_UPSTREAM_CONNECTION},
- {"recovery-min-apply-delay", required_argument, NULL, OPT_RECOVERY_MIN_APPLY_DELAY},
{"replication-user", required_argument, NULL, OPT_REPLICATION_USER},
{"upstream-conninfo", required_argument, NULL, OPT_UPSTREAM_CONNINFO},
{"upstream-node-id", required_argument, NULL, OPT_UPSTREAM_NODE_ID},
@@ -215,11 +210,8 @@ static struct option long_options[] =
/* deprecated */
{"check-upstream-config", no_argument, NULL, OPT_CHECK_UPSTREAM_CONFIG},
- {"no-conninfo-password", no_argument, NULL, OPT_NO_CONNINFO_PASSWORD},
/* previously used by "standby switchover" */
{"remote-config-file", required_argument, NULL, 'C'},
- /* legacy alias for -D/--pgdata */
- {"data-dir", required_argument, NULL, OPT_DATA_DIR},
/* replaced by --node-id */
{"node", required_argument, NULL, OPT_NODE},