Merge branch 'main' into logger

containers · Oct 10, 2023 · 7f5aaa8 · 7f5aaa8
2 parents 5543ff6 + 454ed7d
commit 7f5aaa8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/conmon-rs/server/Cargo.toml b/conmon-rs/server/Cargo.toml
@@ -28,7 +28,7 @@ opentelemetry = { version = "0.20.0", features = ["rt-tokio"] }
 opentelemetry-otlp = "0.13.0"
 opentelemetry-semantic-conventions = "0.12.0"
 prctl = "1.0.0"
-regex = "1.9.6"
+regex = "1.10.0"
 sendfd = { version = "0.4.3", features = ["tokio"] }
 serde = { version = "1.0.188", features = ["derive"] }
 serde_json = "1.0"