From 467fa5200273e451cc0f2d5c16242b2600b3732f Mon Sep 17 00:00:00 2001 From: Cole Bollig Date: Fri, 1 Sep 2023 09:14:24 -0500 Subject: [PATCH] HTCONDOR-1968: Use better wording for when removal will occur --- config/01-ce-router-defaults.conf | 2 +- config/01-ce-router.conf | 2 +- config/02-ce-bosco-defaults.conf | 2 +- config/02-ce-bosco.conf | 2 +- config/02-ce-condor-defaults.conf | 2 +- config/02-ce-condor.conf | 2 +- config/02-ce-lsf-defaults.conf | 2 +- config/02-ce-lsf.conf | 2 +- config/02-ce-pbs-defaults.conf | 2 +- config/02-ce-pbs.conf | 2 +- config/02-ce-sge-defaults.conf | 2 +- config/02-ce-sge.conf | 2 +- config/02-ce-slurm-defaults.conf | 2 +- config/02-ce-slurm.conf | 2 +- contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/01-ce-router-defaults.conf b/config/01-ce-router-defaults.conf index 2a68b7a97..803d8e6b6 100644 --- a/config/01-ce-router-defaults.conf +++ b/config/01-ce-router-defaults.conf @@ -112,7 +112,7 @@ MERGE_JOB_ROUTER_DEFAULT_ADS=True # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_DEFAULTS = $(JOB_ROUTER_DEFAULTS_GENERATED) diff --git a/config/01-ce-router.conf b/config/01-ce-router.conf index 16e99aeb5..ab17cf199 100644 --- a/config/01-ce-router.conf +++ b/config/01-ce-router.conf @@ -46,7 +46,7 @@ MERGE_JOB_ROUTER_DEFAULT_ADS=True # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_DEFAULTS = $(JOB_ROUTER_DEFAULTS_GENERATED) diff --git a/config/02-ce-bosco-defaults.conf b/config/02-ce-bosco-defaults.conf index af47bdfd5..e5cf49cfb 100644 --- a/config/02-ce-bosco-defaults.conf +++ b/config/02-ce-bosco-defaults.conf @@ -16,7 +16,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES = \ [ \ diff --git a/config/02-ce-bosco.conf b/config/02-ce-bosco.conf index a396b09c3..10f182377 100644 --- a/config/02-ce-bosco.conf +++ b/config/02-ce-bosco.conf @@ -14,7 +14,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES = \ [ \ diff --git a/config/02-ce-condor-defaults.conf b/config/02-ce-condor-defaults.conf index ca66f3c31..930943eb3 100644 --- a/config/02-ce-condor-defaults.conf +++ b/config/02-ce-condor-defaults.conf @@ -16,7 +16,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/config/02-ce-condor.conf b/config/02-ce-condor.conf index da2a9576f..35ddec214 100644 --- a/config/02-ce-condor.conf +++ b/config/02-ce-condor.conf @@ -14,7 +14,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/config/02-ce-lsf-defaults.conf b/config/02-ce-lsf-defaults.conf index 75a67d7c9..75dcd642a 100644 --- a/config/02-ce-lsf-defaults.conf +++ b/config/02-ce-lsf-defaults.conf @@ -15,7 +15,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/config/02-ce-lsf.conf b/config/02-ce-lsf.conf index 503c4d41b..0b760ecc6 100644 --- a/config/02-ce-lsf.conf +++ b/config/02-ce-lsf.conf @@ -13,7 +13,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/config/02-ce-pbs-defaults.conf b/config/02-ce-pbs-defaults.conf index 542ee82bb..b75d4fa6e 100644 --- a/config/02-ce-pbs-defaults.conf +++ b/config/02-ce-pbs-defaults.conf @@ -15,7 +15,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/config/02-ce-pbs.conf b/config/02-ce-pbs.conf index 521106344..d8e5b776d 100644 --- a/config/02-ce-pbs.conf +++ b/config/02-ce-pbs.conf @@ -13,7 +13,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/config/02-ce-sge-defaults.conf b/config/02-ce-sge-defaults.conf index 3af1d79bd..a9049c513 100644 --- a/config/02-ce-sge-defaults.conf +++ b/config/02-ce-sge-defaults.conf @@ -15,7 +15,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/config/02-ce-sge.conf b/config/02-ce-sge.conf index e34d72302..0f36e0fbb 100644 --- a/config/02-ce-sge.conf +++ b/config/02-ce-sge.conf @@ -13,7 +13,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/config/02-ce-slurm-defaults.conf b/config/02-ce-slurm-defaults.conf index 77053d11f..287cf9dc7 100644 --- a/config/02-ce-slurm-defaults.conf +++ b/config/02-ce-slurm-defaults.conf @@ -15,7 +15,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/config/02-ce-slurm.conf b/config/02-ce-slurm.conf index 53b953f0e..b08819c46 100644 --- a/config/02-ce-slurm.conf +++ b/config/02-ce-slurm.conf @@ -13,7 +13,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf b/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf index 4e124deee..6c23f6f6a 100644 --- a/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf +++ b/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf @@ -14,7 +14,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES = \ [ \