Skip to content

Commit

Permalink
Merge of #4877
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Aug 3, 2022
2 parents dd273fe + ef0c98b commit 02c52ce
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions zebra-rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jsonrpc-core = "18.0.0"
jsonrpc-derive = "18.0.0"
jsonrpc-http-server = "18.0.0"
# zebra-rpc needs the preserve_order feature in serde_json, which is a dependency of jsonrpc-core
serde_json = { version = "1.0.82", features = ["preserve_order"] }
serde_json = { version = "1.0.83", features = ["preserve_order"] }
indexmap = { version = "1.9.1", features = ["serde"] }

tokio = { version = "1.20.1", features = ["time", "rt-multi-thread", "macros", "tracing"] }
Expand All @@ -46,7 +46,7 @@ proptest-derive = { version = "0.3.0", optional = true }
insta = { version = "1.15.0", features = ["redactions"] }
proptest = "0.10.1"
proptest-derive = "0.3.0"
serde_json = "1.0.82"
serde_json = "1.0.83"
thiserror = "1.0.31"

tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }
Expand Down
2 changes: 1 addition & 1 deletion zebra-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ publish = false
structopt = "0.3.26"
color-eyre = "0.6.1"
hex = "0.4.3"
serde_json = "1.0.82"
serde_json = "1.0.83"
tracing-error = "0.2.0"
tracing-subscriber = "0.3.11"

Expand Down
2 changes: 1 addition & 1 deletion zebrad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ regex = "1.6.0"
semver = "1.0.11"

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

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

0 comments on commit 02c52ce

Please sign in to comment.