Skip to content

Commit

Permalink
Merge of #6502
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Apr 13, 2023
2 parents b6894a0 + 88cb4a5 commit 3a8db20
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4114,9 +4114,9 @@ dependencies = [

[[package]]
name = "serde_json"
version = "1.0.95"
version = "1.0.96"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
dependencies = [
"indexmap",
"itoa",
Expand Down
2 changes: 1 addition & 1 deletion zebra-rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jsonrpc-http-server = "18.0.0"
num_cpus = "1.15.0"

# zebra-rpc needs the preserve_order feature in serde_json, which is a dependency of jsonrpc-core
serde_json = { version = "1.0.95", features = ["preserve_order"] }
serde_json = { version = "1.0.96", features = ["preserve_order"] }
indexmap = { version = "1.9.3", features = ["serde"] }

tokio = { version = "1.27.0", features = ["time", "rt-multi-thread", "macros", "tracing"] }
Expand Down
2 changes: 1 addition & 1 deletion zebra-state/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ tracing = "0.1.37"

# elasticsearch specific dependencies.
elasticsearch = { version = "8.5.0-alpha.1", package = "elasticsearch", optional = true }
serde_json = { version = "1.0.95", package = "serde_json", optional = true }
serde_json = { version = "1.0.96", package = "serde_json", optional = true }

zebra-chain = { path = "../zebra-chain" }

Expand Down
2 changes: 1 addition & 1 deletion zebra-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ tinyvec = { version = "1.6.0", features = ["rustc_1_55"] }

structopt = "0.3.26"
hex = "0.4.3"
serde_json = "1.0.95"
serde_json = "1.0.96"
tracing-error = "0.2.0"
tracing-subscriber = "0.3.16"
thiserror = "1.0.40"
Expand Down
2 changes: 1 addition & 1 deletion zebrad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ regex = "1.7.3"
semver = "1.0.17"

# zebra-rpc needs the preserve_order feature, it also makes test results more stable
serde_json = { version = "1.0.95", features = ["preserve_order"] }
serde_json = { version = "1.0.96", features = ["preserve_order"] }
tempfile = "3.5.0"

hyper = { version = "0.14.25", features = ["http1", "http2", "server"]}
Expand Down

0 comments on commit 3a8db20

Please sign in to comment.