From 493ccefbec8d3c8de0fa9b6f2573771c1b872221 Mon Sep 17 00:00:00 2001 From: "A.J. Stein" Date: Thu, 7 Nov 2024 19:12:14 -0500 Subject: [PATCH] Fix up missed rebase conflicts to wrap #850 --- assets/img/goals-flag.svg | 14 --------- pages/updates/platform.md | 66 ++++----------------------------------- 2 files changed, 6 insertions(+), 74 deletions(-) diff --git a/assets/img/goals-flag.svg b/assets/img/goals-flag.svg index bcff58e11..61d703534 100644 --- a/assets/img/goals-flag.svg +++ b/assets/img/goals-flag.svg @@ -1,13 +1,3 @@ -<<<<<<< HEAD -<<<<<<< HEAD - - - - - -======= -======= ->>>>>>> b3b2c872540e3a1e293f8bc603b903f51c5879b9 -<<<<<<< HEAD ->>>>>>> 356c039d5b00121dedea8411465f90c8edf9145e -======= ->>>>>>> b3b2c872540e3a1e293f8bc603b903f51c5879b9 diff --git a/pages/updates/platform.md b/pages/updates/platform.md index 8704ff3f1..b271abcb4 100644 --- a/pages/updates/platform.md +++ b/pages/updates/platform.md @@ -1,80 +1,26 @@ --- layout: base-markdown -<<<<<<< HEAD -title: The FedRAMP Platform -tab-title: The FedRAMP Platform -permalink: /updates/platform/ -summary: ---- - -This should have content about the FedRAMP Platform. - - - -======= title: FedRAMP Platform Updates tab-title: FedRAMP Platform Updates permalink: /updates/platform/ -summary: - This page provides a changelog with status and timeline of milestones in the - development, operation, and maintenance of the FedRAMP Platform. +summary: This page provides a changelog with status and timeline of milestones in the development, operation, and maintenance of the FedRAMP Platform. tags: automation, changelog, platform, updates --- -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> f51003e0 (Stage platform updates page for #853) -======= -======= -# Description +# Status -The Platform is for FedRAMP, agencies, cloud service providers, and third party -assessment organization (3PAO) staff to collaborate on digital authorization -packages and continuous monitoring data in a unified portal. Moving forward, -FedRAMP will facilitate interactions with these stakeholders in the portal using -the Platform’s web interface or automated workflows via application programming -interfaces (APIs). This approach will make authorizations easier, expand -continuous monitoring capabilities, enhance communication between stakeholders, -and facilitate tracking and publishing metrics transparently. +In Development -FedRAMP is actively working with our stakeholders, using a human-centered design -approach, to incrementally design, test, and deploy the FedRAMP Platform. You -can learn more about the journey, our progress, and key milestones below. +# Description ->>>>>>> af808150 (finalizing some tweaks / remove JAB) -# Status +The Platform is for FedRAMP, agencies, cloud service providers, and third party assessment organization (3PAO) staff to collaborate on digital authorization packages and continuous monitoring data in a unified portal. Moving forward, FedRAMP will facilitate interactions with these stakeholders in the portal using the Platform’s web interface or automated workflows via application programming interfaces (APIs). This approach will make authorizations easier, expand continuous monitoring capabilities, enhance communication between stakeholders, and facilitate tracking and publishing metrics transparently. -In Development +FedRAMP is actively working with our stakeholders, using a human-centered design approach, to incrementally design, test, and deploy the FedRAMP Platform. You can learn more about the journey, our progress, and key milestones below. # Timeline and Milestones - July 2024 - **Complete** - FedRAMP awarded the task order for the Platform. -<<<<<<< HEAD -<<<<<<< HEAD -- FY24 Q4 - **FY25 Q2** - In Progress - FedRAMP began ongoing human-centered design sessions. -- FY25 Q2 - **Next** - FedRAMP will conduct a pilot of the continuous monitoring processes via the Platform with synthetic data. -<<<<<<< HEAD -- FY25 Q4 - **Later** - FedRAMP will obtain a GSA Authority to Operate (ATO) and develops APIs with select agencies. -- FY25 Q4 thru FY26 - **Later** - FedRAMP will provide live and on-demand training and start deploying the Platform. - ->>>>>>> c91af7bc (Add status, description, and timeline for #853) -======= -- FY25 Q3 - **Later** - FedRAMP obtains a GSA Authority to Operate (ATO) and develops APIs with select agencies. Once completed, FedRAMP will deploy the platform. -======= - FY24 Q4 - **FY25 Q2** - In Progress - FedRAMP launched ongoing human-centered design sessions. - FY25 Q2 - **Next** - FedRAMP will conduct a pilot of the continuous monitoring processes in the Platform with synthetic data. - FY25 Q3 - **Later** - FedRAMP obtains a GSA Authority to Operate (ATO) and develops APIs with select agencies. Once completed, FedRAMP will deploy the Platform. ->>>>>>> 788a9b9a (Accept editorial changes from @Marcia-Simms for #853) - FY25 Q4 - **Later** - FedRAMP will provide live and on-demand training and start deploying enhancements to the Platform. ->>>>>>> ec6e6912 (More content edits from Michelle and I for #853) -======= -- FY24 Q4 - **FY25 Q2** - In Progress - FedRAMP launched ongoing human-centered - design sessions. -- FY25 Q2 - **Next** - FedRAMP will conduct a pilot of the continuous monitoring - processes in the Platform with synthetic data. -- FY25 Q3 - **Later** - FedRAMP obtains a GSA Authority to Operate (ATO) and - develops APIs with select agencies. Once completed, FedRAMP will deploy the - Platform. -- FY25 Q4 - **Later** - FedRAMP will provide live and on-demand training and - start deploying enhancements to the Platform. ->>>>>>> af808150 (finalizing some tweaks / remove JAB)