Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync missing commits #320

Merged
merged 9 commits into from
Mar 10, 2022
36 changes: 14 additions & 22 deletions Cargo.lock

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

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ libc = "0.2"
vmm-sys-util = ">=0.9.0"
clap = "2.33"
flexi_logger = { version = "0.17" }
# pin regex to fix RUSTSEC-2022-0013
regex = ">=1.5.5"
serde = { version = ">=1.0.27", features = ["serde_derive", "rc"] }
serde_json = "1.0.51"
serde_with = { version = "1.6.0", features = ["macros"] }
Expand Down
2 changes: 2 additions & 0 deletions app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ build = "build.rs"
built = { version = "=0.4.3", features = ["chrono", "git2"] }

[dependencies]
# pin regex to fix RUSTSEC-2022-0013
regex = ">=1.5.5"
flexi_logger = { version = "0.17" }
libc = "0.2"
log = "0.4"
Expand Down
8 changes: 5 additions & 3 deletions blobfs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ fuse-backend-rs = { version = "0.3.0" }

rafs = { path = "../rafs" }
nydus-error = { path = "../error" }
storage = { path = "../storage", features = ["backend-localfs", "backend-oss", "backend-registry"] }
storage = { path = "../storage", features = ["backend-localfs"] }

[features]
virtiofs = [ "fuse-backend-rs/virtiofs", "vm-memory/backend-mmap"]
virtiofs = [ "fuse-backend-rs/virtiofs", "rafs/virtio-fs" ]
backend-oss = ["rafs/backend-oss"]
backend-registry = ["rafs/backend-registry"]

[dev-dependencies]
nydus-app = { path = "../app" }
nydus-app = { version = "0.2", path = "../app" }
Loading