Skip to content

Commit

Permalink
chore: Merge release/1.1.1 into main (#895)
Browse files Browse the repository at this point in the history
chore: Merge release/1.1.1 into main
  • Loading branch information
eclipse-zenoh-bot authored Jan 17, 2025
2 parents bcfe807 + 1c9f89b commit 623a15b
Show file tree
Hide file tree
Showing 6 changed files with 136 additions and 136 deletions.
122 changes: 61 additions & 61 deletions Cargo.lock

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

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
[package]
name = "zenoh-c"
version = "1.0.0-dev"
version = "1.1.1"
repository = "https://github.com/eclipse-zenoh/zenoh-c"
homepage = "http://zenoh.io"
authors = [
Expand Down Expand Up @@ -74,10 +74,10 @@ spin = "0.9.5"
tokio = "*"
unwrap-infallible = "0.1.5"
const_format = "0.2.32"
zenoh = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false, features = ["internal"] }
zenoh-ext = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", features=["internal"], branch = "main" }
zenoh-runtime = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
zenoh-util = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
zenoh = { version = "1.1.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/1.1.1", default-features = false, features = ["internal"] }
zenoh-ext = { version = "1.1.1", git = "https://github.com/eclipse-zenoh/zenoh.git", features=["internal"], branch = "release/1.1.1" }
zenoh-runtime = { version = "1.1.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/1.1.1" }
zenoh-util = { version = "1.1.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/1.1.1" }
flume = "*"

[build-dependencies]
Expand Down Expand Up @@ -108,7 +108,7 @@ maintainer = "[email protected]"
copyright = "2017, 2022 ZettaScale Technology"
section = "net"
license-file = ["LICENSE", "0"]
depends = "libzenohc (=1.0.0~dev-1)"
depends = "libzenohc (=1.1.1)"
assets = [["include/*", "usr/include/", "755"]]

[profile.dev]
Expand Down
10 changes: 5 additions & 5 deletions Cargo.toml.in
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ spin = "0.9.5"
tokio = "*"
unwrap-infallible = "0.1.5"
const_format = "0.2.32"
zenoh = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false, features = ["internal"] }
zenoh-ext = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", features=["internal"], branch = "main" }
zenoh-runtime = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
zenoh-util = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
zenoh = { version = "1.1.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/1.1.1", default-features = false, features = ["internal"] }
zenoh-ext = { version = "1.1.1", git = "https://github.com/eclipse-zenoh/zenoh.git", features=["internal"], branch = "release/1.1.1" }
zenoh-runtime = { version = "1.1.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/1.1.1" }
zenoh-util = { version = "1.1.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/1.1.1" }
flume = "*"

[build-dependencies]
Expand Down Expand Up @@ -108,7 +108,7 @@ maintainer = "[email protected]"
copyright = "2017, 2022 ZettaScale Technology"
section = "net"
license-file = ["LICENSE", "0"]
depends = "libzenohc (=1.0.0~dev-1)"
depends = "libzenohc (=1.1.1)"
assets = [["include/*", "usr/include/", "755"]]

[profile.dev]
Expand Down
Loading

0 comments on commit 623a15b

Please sign in to comment.