From 2e60a1f6343a39b89411b51809a11b86a5be2e26 Mon Sep 17 00:00:00 2001 From: Levente Kurusa Date: Thu, 30 Aug 2018 00:04:53 +0200 Subject: [PATCH] Relicense under MIT OR Apache-2.0 Signed-off-by: Levente Kurusa --- Cargo.toml | 2 +- LICENSE | 23 ++++------------------- LICENSE-Apache-2.0 | 13 +++++++++++++ LICENSE-MIT | 21 +++++++++++++++++++++ 4 files changed, 39 insertions(+), 20 deletions(-) create mode 100644 LICENSE-Apache-2.0 create mode 100644 LICENSE-MIT diff --git a/Cargo.toml b/Cargo.toml index dad3ace..622c986 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ description = "Native Rust crate for managing control groups on Linux" repository = "https://github.com/levex/cgroups-rs" keywords = ["linux", "cgroup", "containers", "isolation"] categories = ["os", "api-bindings", "os::unix-apis"] -license = "BSD-2-Clause OR Apache-2.0" +license = "MIT OR Apache-2.0" version = "0.0.1" authors = ["Levente Kurusa "] diff --git a/LICENSE b/LICENSE index edf9f2f..fc9842e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,6 @@ -MIT License +This crate is licensed under either of -Copyright (c) 2018 Levente Kurusa +- "Apache License, Version 2.0, (See LICENSE-Apache-2.0 file); or +- "MIT license" (See LICENSE-MIT file), -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +at your option. diff --git a/LICENSE-Apache-2.0 b/LICENSE-Apache-2.0 new file mode 100644 index 0000000..4d1a213 --- /dev/null +++ b/LICENSE-Apache-2.0 @@ -0,0 +1,13 @@ +Copyright 2018 Levente Kurusa + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/LICENSE-MIT b/LICENSE-MIT new file mode 100644 index 0000000..edf9f2f --- /dev/null +++ b/LICENSE-MIT @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018 Levente Kurusa + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.