Skip to content

Commit

Permalink
Merge branch 'main' into ep/retain-endpoints
Browse files Browse the repository at this point in the history
  • Loading branch information
XAMPPRocky authored Oct 15, 2023
2 parents 0adabf6 + cdd3e82 commit e78ba74
Show file tree
Hide file tree
Showing 74 changed files with 2,376 additions and 1,040 deletions.
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @markmandel @xampprocky @No-ops @rezvaneh @vallfors
* @markmandel @xampprocky @koslib
36 changes: 18 additions & 18 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ arc-swap = { version = "1.6.0", features = ["serde"] }
async-stream = "0.3.5"
base64.workspace = true
base64-serde = "0.7.0"
bytes = { version = "1.4.0", features = ["serde"] }
cached = "0.45.0"
chrono = "0.4.28"
clap = { version = "4.4.2", features = ["cargo", "derive", "env"] }
bytes = { version = "1.5.0", features = ["serde"] }
cached = "0.46.0"
chrono = "0.4.31"
clap = { version = "4.4.6", features = ["cargo", "derive", "env"] }
dashmap = { version = "5.5.3", features = ["serde"] }
dirs2 = "3.0.1"
either = "1.9.0"
enum-map = "2.6.1"
enum-map = "2.6.3"
eyre = "0.6.8"
futures.workspace = true
hyper = { version = "0.14.27", features = ["http2"] }
Expand All @@ -73,23 +73,23 @@ num_cpus = "1.16.0"
once_cell = "1.18.0"
parking_lot = "0.12.1"
prometheus = { version = "0.13.3", default-features = false }
prost = "0.12.0"
prost-types = "0.12.0"
prost = "0.12.1"
prost-types = "0.12.1"
rand = "0.8.5"
regex = "1.9.5"
schemars = { version = "0.8.13", features = ["chrono", "bytes", "url"] }
regex = "1.9.6"
schemars = { version = "0.8.15", features = ["chrono", "bytes", "url"] }
serde = { version = "1.0.188", features = ["derive", "rc"] }
serde_json = "1.0.105"
serde_json = "1.0.107"
serde_regex = "1.1.0"
serde_stacker = "0.1.10"
serde_yaml = "0.9.25"
snap = "1.1.0"
socket2 = { version = "0.5.3", features = ["all"] }
socket2 = { version = "0.5.4", features = ["all"] }
stable-eyre = "0.2.2"
thiserror = "1.0.48"
thiserror = "1.0.49"
tokio.workspace = true
tokio-stream = { version = "0.1.14", features = ["sync"] }
tonic = "0.10.0"
tonic = "0.10.2"
tracing.workspace = true
tracing-futures = { version = "0.2.5", features = ["futures-03"] }
tracing-subscriber = { version = "0.3.17", features = ["json", "env-filter"] }
Expand All @@ -103,14 +103,14 @@ async-trait = "0.1.73"
nom = "7.1.3"
atty = "0.2.14"
strum = "0.25.0"
strum_macros = "0.25"
strum_macros = "0.25.2"
itertools = "0.11.0"

[target.'cfg(target_os = "linux")'.dependencies]
sys-info = "0.9.1"

[dev-dependencies]
regex = "1.9.5"
regex = "1.9.6"
criterion = { version = "0.5.1", features = ["html_reports"] }
once_cell = "1.18.0"
tracing-test = "0.2.4"
Expand All @@ -119,9 +119,9 @@ tempfile = "3.8.0"
rand = "0.8.5"

[build-dependencies]
tonic-build = { version = "0.10.0", default_features = false, features = ["transport", "prost"] }
prost-build = "0.12.0"
built = { version = "0.6.1", features = ["git2"] }
tonic-build = { version = "0.10.2", default_features = false, features = ["transport", "prost"] }
prost-build = "0.12.1"
built = { version = "0.7.0", features = ["git2"] }
protobuf-src = { version = "1.1.0", optional = true }

[features]
Expand Down
3 changes: 2 additions & 1 deletion agones/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ readme = "README.md"

[dependencies]
base64.workspace = true
futures.workspace = true
k8s-openapi.workspace = true
kube = { workspace = true, features = ["openssl-tls", "client", "derive", "runtime"] }
quilkin = { path = "../" }
serial_test = "2.0.0"
tokio.workspace = true
futures.workspace = true
tracing.workspace = true
Loading

0 comments on commit e78ba74

Please sign in to comment.