Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

2 files changed, 0 insertions, 39 deletions

diff --git a/src/mongo/util/version/releases.h.tpl b/src/mongo/util/version/releases.h.tpl
index ddab494047d..701266bc71f 100644
--- a/src/mongo/util/version/releases.h.tpl
+++ b/src/mongo/util/version/releases.h.tpl
@@ -242,24 +242,6 @@ constexpr StringData toString(FeatureCompatibilityVersion v) {
     return findExtended(v).second;
 }
 
-inline int majorVersion(FeatureCompatibilityVersion v) {
-    auto str = toString(v);
-    auto pos = str.rfind('.');
-    if (pos == std::string::npos) {
-        return -1;
-    }
-    return stoi(str.substr(pos-1, 1).toString());
-}
-
-inline int minorVersion(FeatureCompatibilityVersion v) {
-    auto str = toString(v);
-    auto pos = str.rfind('.');
-    if (pos == std::string::npos) {
-        return -1;
-    }
-    return stoi(str.substr(pos+1, 1).toString());
-}
-
 /**
  * Pointers to nodes of the extended table that represent numbered software versions.
  * Other FCV enum members, such as those representing transitions, are excluded.
diff --git a/src/mongo/util/version/releases.yml b/src/mongo/util/version/releases.yml
index 3babf32c3f7..ca829d039c9 100644
--- a/src/mongo/util/version/releases.yml
+++ b/src/mongo/util/version/releases.yml
@@ -24,27 +24,6 @@ longTermSupportReleases:
   - "4.4"
   - "5.0"
 
-# List of stable MongoDB versions since 2.0 that have been EOL'd.
-# Entries to this section will also stop them from running as "old" versions in
-# multiversion testing across all branches. This is because there is no need to
-# run multiversion testing against EOL versions.
-eolVersions:
-  - "2.0"
-  - "2.2"
-  - "2.4"
-  - "2.6"
-  - "3.0" # 2018-02
-  - "3.2" # 2018-09
-  - "3.4" # 2020-01
-  - "3.6" # 2021-04
-  - "4.0" # 2022-04
-# - "4.2" # 2023-04
-# - "4.4" # 2024-02
-# - "5.0" # 2024-10
-  - "5.1" # 2022-01
-  - "5.2" # 2022-04
-  - "5.3" # 2022-07
-
 # Optional.
 # Using this special override extends FCV constant generation down to the previous value of
 # lastLTS. This is intended to ease the transition to a new lastLTS by extending the lifetime