Merge branch 'master' into ci/macos_target

dragonflyoss · Jun 16, 2023 · e7c7b18 · e7c7b18
2 parents b3001a2 + 9d89b8d
commit e7c7b18
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -56,12 +56,12 @@ openssl = { version = "0.10.48", features = ["vendored"] }
 # pin openssl-src to bring in fix for https://rustsec.org/advisories/RUSTSEC-2022-0032
 #openssl-src = { version = "111.22" }
 
-nydus-api = { version = "0.2.2", path = "api", features = ["handler"] }
+nydus-api = { version = "0.3.0", path = "api", features = ["handler"] }
 nydus-builder = { version = "0.1.0", path = "builder" }
-nydus-rafs = { version = "0.3.0", path = "rafs" }
-nydus-service = { version = "0.2.0", path = "service", features = ["block-device"] }
-nydus-storage = { version = "0.6.2", path = "storage" }
-nydus-utils = { version = "0.4.1", path = "utils" }
+nydus-rafs = { version = "0.3.1", path = "rafs" }
+nydus-service = { version = "0.3.0", path = "service", features = ["block-device"] }
+nydus-storage = { version = "0.6.3", path = "storage" }
+nydus-utils = { version = "0.4.2", path = "utils" }
 
 vhost = { version = "0.5.0", features = ["vhost-user-slave"], optional = true }
 vhost-user-backend = { version = "0.7.0", optional = true }

diff --git a/api/Cargo.toml b/api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nydus-api"
-version = "0.2.2"
+version = "0.3.0"
 description = "APIs for Nydus Image Service"
 authors = ["The Nydus Developers"]
 license = "Apache-2.0 OR BSD-3-Clause"

diff --git a/builder/Cargo.toml b/builder/Cargo.toml
@@ -23,7 +23,7 @@ tar = "0.4.38"
 vmm-sys-util = "0.10.0"
 xattr = "0.2.3"
 
-nydus-api = { version = "0.2", path = "../api" }
+nydus-api = { version = "0.3", path = "../api" }
 nydus-rafs = { version = "0.3", path = "../rafs" }
 nydus-storage = { version = "0.6", path = "../storage", features = ["backend-localfs"] }
 nydus-utils = { version = "0.4", path = "../utils" }

diff --git a/clib/Cargo.toml b/clib/Cargo.toml
@@ -16,9 +16,9 @@ crate-type = ["cdylib", "staticlib"]
 libc = "0.2.137"
 log = "0.4.17"
 fuse-backend-rs = "^0.10.3"
-nydus-api = { version = "0.2", path = "../api" }
-nydus-rafs = { version = "0.3.0", path = "../rafs" }
-nydus-storage = { version = "0.6.2", path = "../storage" }
+nydus-api = { version = "0.3", path = "../api" }
+nydus-rafs = { version = "0.3.1", path = "../rafs" }
+nydus-storage = { version = "0.6.3", path = "../storage" }
 
 [features]
 baekend-s3 = ["nydus-storage/backend-s3"]

diff --git a/rafs/Cargo.toml b/rafs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nydus-rafs"
-version = "0.3.0"
+version = "0.3.1"
 description = "The RAFS filesystem format for Nydus Image Service"
 authors = ["The Nydus Developers"]
 license = "Apache-2.0 OR BSD-3-Clause"
@@ -21,7 +21,7 @@ serde_json = "1.0.53"
 vm-memory = "0.9"
 fuse-backend-rs = "^0.10.3"
 
-nydus-api = { version = "0.2", path = "../api" }
+nydus-api = { version = "0.3", path = "../api" }
 nydus-storage = { version = "0.6", path = "../storage", features = ["backend-localfs"] }
 nydus-utils = { version = "0.4", path = "../utils" }
 

diff --git a/service/Cargo.toml b/service/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nydus-service"
-version = "0.2.0"
+version = "0.3.0"
 description = "Nydus Image Service Manager"
 authors = ["The Nydus Developers"]
 license = "Apache-2.0"
@@ -24,10 +24,10 @@ thiserror = "1.0"
 time = { version = "0.3.14", features = ["serde-human-readable"] }
 tokio = { version = "1.24", features = ["macros"] }
 
-nydus-api = { version = "0.2.2", path = "../api"}
-nydus-rafs = { version = "0.3.0", path = "../rafs" }
-nydus-storage = { version = "0.6.2", path = "../storage" }
-nydus-utils = { version = "0.4.1", path = "../utils" }
+nydus-api = { version = "0.3.0", path = "../api"}
+nydus-rafs = { version = "0.3.1", path = "../rafs" }
+nydus-storage = { version = "0.6.3", path = "../storage" }
+nydus-utils = { version = "0.4.2", path = "../utils" }
 
 vhost = { version = "0.5.0", features = ["vhost-user-slave"], optional = true }
 vhost-user-backend = { version = "0.7.0", optional = true }

diff --git a/storage/Cargo.toml b/storage/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nydus-storage"
-version = "0.6.2"
+version = "0.6.3"
 description = "Storage subsystem for Nydus Image Service"
 authors = ["The Nydus Developers"]
 license = "Apache-2.0 OR BSD-3-Clause"
@@ -35,7 +35,7 @@ vm-memory = "0.9"
 fuse-backend-rs = "^0.10.3"
 gpt = { version = "3.0.0", optional = true }
 
-nydus-api = { version = "0.2", path = "../api" }
+nydus-api = { version = "0.3", path = "../api" }
 nydus-utils = { version = "0.4", path = "../utils", features = ["encryption", "zran"] }
 sha1 = { version = "0.10.5", optional = true }
 

diff --git a/utils/Cargo.toml b/utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nydus-utils"
-version = "0.4.1"
+version = "0.4.2"
 description = "Utilities and helpers for Nydus Image Service"
 authors = ["The Nydus Developers"]
 license = "Apache-2.0 OR BSD-3-Clause"
@@ -24,7 +24,7 @@ tokio = { version = "1.19.0", features = ["rt", "sync"] }
 zstd = "0.11"
 nix = "0.24"
 
-nydus-api = { version = "0.2.2", path = "../api" }
+nydus-api = { version = "0.3", path = "../api" }
 
 # libz-ng-sys doesn't compile on ppc64. Have to fallback to stock zlib-sys
 [target.'cfg(target_arch = "powerpc64")'.dependencies]