Merge branch '2024-05-14-bug-fixes' into socket-fixes

usdot-jpo-ode · May 16, 2024 · 31678a3 · 31678a3
2 parents e9aee4d + b150c32
commit 31678a3
Show file tree

Hide file tree

Showing 7 changed files with 368 additions and 1,181 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
-    "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable"
-}
+  "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable",
+  "cSpell.words": ["Bsms"]
+}
diff --git a/api/jpo-conflictmonitor b/api/jpo-conflictmonitor