From 311c36ceda9744827a7488350d626d30e41d8fda Mon Sep 17 00:00:00 2001 From: Johan Ljunggren Date: Thu, 7 Dec 2017 18:39:06 +0100 Subject: [PATCH 1/4] Changes to SqlServerDsc - Added a CODE_OF_CONDUCT.md with the same content as in the README.md (issue #939). --- CHANGELOG.md | 2 ++ CODE_OF_CONDUCT.md | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ad7a806c..1fc9809a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ - Moved decoration for integration test to resolve a breaking change in DscResource.Tests. - Activated the GitHub App Stale on the GitHub repository. + - Added a CODE\_OF\_CONDUCT.md with the same content as in the README.md + [issue #939](https://github.com/PowerShell/SqlServerDsc/issues/939). - New resources: - Added SqlScriptQueryResource. [Chase Wilson (@chasewilson)](https://github.com/chasewilson) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..1d5c9eab1 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,6 @@ +# Code of conduct + +This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). +For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) +or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional +questions or comments. From 3c7a778e4b62de1111957bf0ce17ab43b0daf386 Mon Sep 17 00:00:00 2001 From: Johan Ljunggren Date: Thu, 7 Dec 2017 19:16:23 +0100 Subject: [PATCH 2/4] Remove code of conduct from README.md --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index 7e6e8460e..11ff581be 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,6 @@ The **SqlServerDsc** module contains DSC resources for deployment and configuration of SQL Server. -This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). -For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) -or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional -questions or comments. - ## Branches ### master From b41f413bfe08744a5fc2739ab3174199a935b924 Mon Sep 17 00:00:00 2001 From: Johan Ljunggren Date: Fri, 8 Jun 2018 16:30:16 +0200 Subject: [PATCH 3/4] Added link from README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 11ff581be..b8434ff7b 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ The **SqlServerDsc** module contains DSC resources for deployment and configuration of SQL Server. +This project has adopted [this code of conduct](\CODE_OF_CONDUCT.md). + ## Branches ### master From 09a07fa16f30d10912dc84d919e8f03c01159ee0 Mon Sep 17 00:00:00 2001 From: Johan Ljunggren Date: Fri, 8 Jun 2018 16:34:14 +0200 Subject: [PATCH 4/4] Update link in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b8434ff7b..b8a6d3374 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ The **SqlServerDsc** module contains DSC resources for deployment and configuration of SQL Server. -This project has adopted [this code of conduct](\CODE_OF_CONDUCT.md). +This project has adopted [this code of conduct](CODE_OF_CONDUCT.md). ## Branches