From cc69ecbc4423f91d54941cc6e11d199e2447627d Mon Sep 17 00:00:00 2001 From: "A.J. Stein" Date: Fri, 8 Nov 2024 18:30:23 -0500 Subject: [PATCH] Fix the boolean check for #833 that held it up Shout out to @kyhu65867 for trying to warn me about this during a long pairing session, but me missing the hint. --- .../fedramp-external-constraints.xml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/validations/constraints/fedramp-external-constraints.xml b/src/validations/constraints/fedramp-external-constraints.xml index d5f9d5085..e3773cb65 100644 --- a/src/validations/constraints/fedramp-external-constraints.xml +++ b/src/validations/constraints/fedramp-external-constraints.xml @@ -189,6 +189,7 @@ +<<<<<<< HEAD @@ -197,6 +198,29 @@ +======= + + + + + + + + +

FedRAMP considers every major version as a possible source of backwards-compatible changes. FedRAMP only accepts versions with the same major version, but not newer.

+
+
+ + + + + A FedRAMP document SHOULD have an OSCAL version that matches the minimally required version for FedRAMP packages ({$fedramp-required-minimum-version} not {.}). + +>>>>>>> d37d0dd0 (Fix the boolean check for #833 that held it up) Data Center Alternate