diff --git a/build/lib/pgBackRestBuild/Config/Data.pm b/build/lib/pgBackRestBuild/Config/Data.pm index acb7334e2..6aec93acf 100644 --- a/build/lib/pgBackRestBuild/Config/Data.pm +++ b/build/lib/pgBackRestBuild/Config/Data.pm @@ -701,6 +701,7 @@ my %hConfigDefine = &CFGDEF_DEPEND_OPTION => CFGOPT_TYPE, &CFGDEF_DEPEND_LIST => [ + &CFGOPTVAL_RESTORE_TYPE_IMMEDIATE, &CFGOPTVAL_RESTORE_TYPE_NAME, &CFGOPTVAL_RESTORE_TYPE_TIME, &CFGOPTVAL_RESTORE_TYPE_XID, @@ -1886,6 +1887,7 @@ my %hConfigDefine = &CFGDEF_DEPEND_LIST => [ &CFGOPTVAL_RESTORE_TYPE_DEFAULT, + &CFGOPTVAL_RESTORE_TYPE_IMMEDIATE, &CFGOPTVAL_RESTORE_TYPE_NAME, &CFGOPTVAL_RESTORE_TYPE_TIME, &CFGOPTVAL_RESTORE_TYPE_XID, diff --git a/doc/xml/release.xml b/doc/xml/release.xml index 2c113fb45..a02476282 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -14,6 +14,16 @@ + + + + + + +

Fix --target-action and --recovery-option options being reported as invalid when restoring with --type=immediate.

+
+
+ @@ -4208,6 +4218,11 @@ jmccormick2001 + + Brad Nicholson + bradnicholson + + Markus Nullmeier mnullmei diff --git a/src/config/define.auto.c b/src/config/define.auto.c index 663c64da0..7a4be9be4 100644 --- a/src/config/define.auto.c +++ b/src/config/define.auto.c @@ -2137,6 +2137,7 @@ static ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST ( cfgDefOptType, "default", + "immediate", "name", "time", "xid" @@ -3619,6 +3620,7 @@ static ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST CFGDEFDATA_OPTION_OPTIONAL_DEPEND_LIST ( cfgDefOptType, + "immediate", "name", "time", "xid"