From 358f762712470b1398d9909d6dfcd1e138a17e6f Mon Sep 17 00:00:00 2001 From: Sean Griffin Date: Tue, 9 Jan 2018 13:16:05 -0700 Subject: [PATCH 1/2] Explicitly state our license in the README, use `OR` in Cargo.toml Fixes #1225 --- Cargo.toml | 2 +- README.md | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 67deebe6874..c4c5074376b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "cargo-registry" authors = ["Alex Crichton "] version = "0.2.2" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/crates.io" description = "Backend of crates.io" diff --git a/README.md b/README.md index 94051304a8b..695a00bb7cc 100644 --- a/README.md +++ b/README.md @@ -57,3 +57,12 @@ categories will be synced from this file. ## Running a mirror Please see [docs/MIRROR.md](https://github.com/rust-lang/crates.io/blob/master/docs/MIRROR.md) for instructions on setting up a mirror of crates.io. + +## License + +Licensed under either of these: + + * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or + https://www.apache.org/licenses/LICENSE-2.0) + * MIT license ([LICENSE-MIT](LICENSE-MIT) or + https://opensource.org/licenses/MIT) From a2be65f108ac7f29dc90318f14054ad971c6218a Mon Sep 17 00:00:00 2001 From: Sean Griffin Date: Tue, 9 Jan 2018 17:52:03 -0700 Subject: [PATCH 2/2] Update license expression in `s3` --- src/s3/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/s3/Cargo.toml b/src/s3/Cargo.toml index e7f6aa78305..a2806be81d4 100644 --- a/src/s3/Cargo.toml +++ b/src/s3/Cargo.toml @@ -3,7 +3,7 @@ name = "cargo-registry-s3" version = "0.2.0" authors = ["Alex Crichton "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/crates.io" description = "Interaction between crates.io and S3 for storing crate files"