From b4b5ba0bfc0346df576c7e5e115f14a2fbb995ec Mon Sep 17 00:00:00 2001 From: Tim Haintz Date: Wed, 31 Oct 2018 21:22:50 +1100 Subject: [PATCH 1/4] Updated LICENSE file to match the Microsoft Open Source Team standard. --- LICENSE | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index 6bf8d3ab..cbf2717d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,22 @@ -The MIT License (MIT) + MIT License -Copyright (c) 2018 Microsoft Corporation. + Copyright (c) Microsoft Corporation. All rights reserved. -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: + 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 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 -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. From afb7d2afb8c42cfad8dbfa5980256cae27c9cefb Mon Sep 17 00:00:00 2001 From: Tim Haintz Date: Wed, 31 Oct 2018 21:26:27 +1100 Subject: [PATCH 2/4] Updated Unreleased section to include LICENSE update. --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c283e48e..d1531e6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +- Update LICENSE file to match the Microsoft Open Source Team standard. + Fixes [Issue #197](https://github.com/PowerShell/ComputerManagementDsc/issues/197) + ## 6.0.0.0 - ScheduledTask: From b55050033e2d15215a1e1fa82edc69b0b2ce9821 Mon Sep 17 00:00:00 2001 From: Tim Haintz Date: Wed, 31 Oct 2018 21:27:51 +1100 Subject: [PATCH 3/4] Updated Unreleased section to include LICENSE update. --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1531e6d..a2cb99f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -- Update LICENSE file to match the Microsoft Open Source Team standard. - Fixes [Issue #197](https://github.com/PowerShell/ComputerManagementDsc/issues/197) +- Updated LICENSE file to match the Microsoft Open Source Team standard. + Fixes [Issue #197](https://github.com/PowerShell/ComputerManagementDsc/issues/197). ## 6.0.0.0 From 3d15251abb8a8f1c54485863c41928bd6faaf7f6 Mon Sep 17 00:00:00 2001 From: Tim Haintz Date: Wed, 31 Oct 2018 21:28:26 +1100 Subject: [PATCH 4/4] Updated LICENSE file to match the Microsoft Open Source Team standard. --- LICENSE | 1 - 1 file changed, 1 deletion(-) diff --git a/LICENSE b/LICENSE index cbf2717d..21071075 100644 --- a/LICENSE +++ b/LICENSE @@ -19,4 +19,3 @@ 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 -