Merge branch 'main' into main

devopsdays · Jan 7, 2025 · faaec49 · faaec49
2 parents c8c9e71 + 6277d1d
commit faaec49
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 59 deletions.
diff --git a/assets/events/2025-los-angeles/speakers/kathryn-bouskill.jpg b/assets/events/2025-los-angeles/speakers/kathryn-bouskill.jpg
diff --git a/assets/events/2025-los-angeles/speakers/patrice-lindo.jpg b/assets/events/2025-los-angeles/speakers/patrice-lindo.jpg
diff --git a/content/events/2025-los-angeles/program/patrice-lindo.md b/content/events/2025-los-angeles/program/patrice-lindo.md
diff --git a/content/events/2025-los-angeles/speakers/kathryn-bouskill.md b/content/events/2025-los-angeles/speakers/kathryn-bouskill.md
@@ -10,7 +10,7 @@ Meta Infrastructure Team
 </h3>
 
 <p>
-
+Bouskill is a senior researcher at Meta where she works in Meta’s Reliability Engineering organization. An anthropologist by training, Bouskill has worked around the world on a range of issues related to technology, risk & security, and public health. She is an adjunct researcher at the RAND Corporation and professor at the Pardee RAND Graduate School. Bouskill holds a Ph.D. in Anthropology and an M.P.H. in Epidemiology from Emory University.
 </p>
 
 <style>

diff --git a/content/events/2025-los-angeles/speakers/patrice-lindo.md b/content/events/2025-los-angeles/speakers/patrice-lindo.md
diff --git a/data/events/2025/los-angeles/main.yml b/data/events/2025/los-angeles/main.yml
@@ -145,12 +145,12 @@ program:
     date: 2025-03-07T00:00:00-08:00
     start_time: "10:00"
     end_time: "10:45"
-  - title: "patrice-lindo"
+  - title: "heather-osborn"
     type: talk
     date: 2025-03-07T00:00:00-08:00
     start_time: "11:00"
     end_time: "11:45"
-  - title: "Open Spaces"
+  - title: "Lunch / Open Spaces"
     type: custom
     date: 2025-03-07T00:00:00-08:00
     start_time: "12:00"
@@ -169,22 +169,17 @@ program:
     type: talk
     date: 2025-03-07T00:00:00-08:00
     start_time: "14:00"
-    end_time: "14:45"
-  - title: "heather-osborn"
-    type: talk
-    date: 2025-03-07T00:00:00-08:00
-    start_time: "15:00"
-    end_time: "15:15"
+    end_time: "14:45"   
   - title: "annie-hedgpeth"
     type: talk
     date: 2025-03-07T00:00:00-08:00
-    start_time: "15:15"
-    end_time: "15:30"
+    start_time: "15:00"
+    end_time: "15:45"
   - title: "rob-fletcher"
     type: talk
     date: 2025-03-07T00:00:00-08:00
-    start_time: "15:30"
-    end_time: "15:45"
+    start_time: "15:45"
+    end_time: "16:00"
   - title: "zoe-chalfant"
     type: talk
     date: 2025-03-07T00:00:00-08:00
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ Meta Infrastructure Team @@
     </h3>
     <p>
+    Bouskill is a senior researcher at Meta where she works in Meta’s Reliability Engineering organization. An anthropologist by training, Bouskill has worked around the world on a range of issues related to technology, risk & security, and public health. She is an adjunct researcher at the RAND Corporation and professor at the Pardee RAND Graduate School. Bouskill holds a Ph.D. in Anthropology and an M.P.H. in Epidemiology from Emory University.
     </p>
     <style>
@@ Expand Down @@