Merge branch 'eclipse-zenoh:dev/1.0.0' into dev/1.0.0

ZettaScaleLabs · Aug 30, 2024 · dfb46f6 · dfb46f6
2 parents 215627a + b5113c5
commit dfb46f6
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -46,13 +46,13 @@ serde_json = "1.0.114"
 tokio = { version = "1.35.1", default-features = false } # Default features are disabled due to some crates' requirements
 tracing = "0.1"
 uhlc = "0.7.0"
-zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0", features = [
+zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = [
   "unstable",
   "internal",
   "plugins",
 ] , version = "1.0.0-dev" }
-zenoh_backend_traits = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" , version = "1.0.0-dev" }
-zenoh-plugin-trait = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" , version = "1.0.0-dev" }
+zenoh_backend_traits = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" , version = "1.0.0-dev" }
+zenoh-plugin-trait = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" , version = "1.0.0-dev" }
 
 [build-dependencies]
 rustc_version = "0.4.0"