From a2fca254ad51e545b93920bfb5f17c85f5c0f0fe Mon Sep 17 00:00:00 2001 From: sarthak khandelwal Date: Tue, 26 Nov 2019 17:07:15 +0530 Subject: [PATCH 1/5] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 423109411..e34e6cb4b 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ ], "homepage": "https://github.com/ipfs/js-ipfs-http-client", "bugs": "https://github.com/ipfs/js-ipfs-http-client/issues", - "license": "MIT", + "license": "(Apache-2.0 OR MIT)", "leadMaintainer": "Alan Shaw ", "files": [ "src", From a3270506acb69219c70b5efa8bf542cb881cd38a Mon Sep 17 00:00:00 2001 From: sarthak khandelwal Date: Tue, 26 Nov 2019 17:11:15 +0530 Subject: [PATCH 2/5] Rename LICENSE to LICENSE-MIT --- LICENSE => LICENSE-MIT | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename LICENSE => LICENSE-MIT (100%) diff --git a/LICENSE b/LICENSE-MIT similarity index 100% rename from LICENSE rename to LICENSE-MIT From 3d72da60151878146dee9763e70cf0dba5a65277 Mon Sep 17 00:00:00 2001 From: sarthak khandelwal Date: Tue, 26 Nov 2019 17:12:50 +0530 Subject: [PATCH 3/5] Create LICENSE-APACHE --- LICENSE-APACHE | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 LICENSE-APACHE diff --git a/LICENSE-APACHE b/LICENSE-APACHE new file mode 100644 index 000000000..14478a3b6 --- /dev/null +++ b/LICENSE-APACHE @@ -0,0 +1,5 @@ +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. From d5e36a1a1ceb3d25b4e45f10bbfb517c82ff465d Mon Sep 17 00:00:00 2001 From: sarthak khandelwal Date: Tue, 26 Nov 2019 17:18:05 +0530 Subject: [PATCH 4/5] Create COPYRIGHT --- COPYRIGHT | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 COPYRIGHT diff --git a/COPYRIGHT b/COPYRIGHT new file mode 100644 index 000000000..157694af6 --- /dev/null +++ b/COPYRIGHT @@ -0,0 +1,5 @@ +This project is transitioning from an MIT-only license to a dual MIT/Apache-2.0 license. +Unless otherwise noted, all code contributed prior to 2019-11-26 and not contributed by +a user listed in [this signoff issue](https://github.com/ipfs/js-ipfs-http-client/issues/1177) is +licensed under MIT-only. All new contributions (and past contributions since 2019-11-21) +are licensed under a dual MIT/Apache-2.0 license. From 0f1924a45ba3ad88a15d14dd907fda058fb63b5d Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Fri, 29 Nov 2019 15:19:47 +0000 Subject: [PATCH 5/5] fix: correct issue and date in COPYRIGHT --- COPYRIGHT | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 157694af6..b8b0a702d 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,5 +1,5 @@ This project is transitioning from an MIT-only license to a dual MIT/Apache-2.0 license. Unless otherwise noted, all code contributed prior to 2019-11-26 and not contributed by -a user listed in [this signoff issue](https://github.com/ipfs/js-ipfs-http-client/issues/1177) is -licensed under MIT-only. All new contributions (and past contributions since 2019-11-21) +a user listed in [this signoff issue](https://github.com/ipfs/js-ipfs-http-client/issues/1189) is +licensed under MIT-only. All new contributions (and past contributions since 2019-11-29) are licensed under a dual MIT/Apache-2.0 license.