From 96e061f7a7c5a2a6c3bdb353dfc8ec80a9196dc2 Mon Sep 17 00:00:00 2001 From: Bill Mulligan Date: Mon, 17 Nov 2025 14:24:16 +0100 Subject: [PATCH 1/4] Proposed Code of Conduct Updates for November 2025 The CNCF Code of Conduct Committee is proposing a change to the Code of Conduct to discourage the use of harmful mass criticism to target an individual and encourage the use of appropriate feedback channels. Public awareness of an issue can be important, but detailed criticism and escalation are best handled privately to ensure thoughtful resolution and to maintain a respectful and inclusive community environment. Signed-off-by: Bill Mulligan --- code-of-conduct.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code-of-conduct.md b/code-of-conduct.md index d036cf1d..c514b261 100644 --- a/code-of-conduct.md +++ b/code-of-conduct.md @@ -57,7 +57,7 @@ Examples of behavior that contributes to a positive environment include but are * Focusing on what is best not just for us as individuals, but for the overall community * Using welcoming and inclusive language - +* Addressing disagreements or concerns through appropriate channels Examples of unacceptable behavior include but are not limited to: @@ -71,7 +71,8 @@ Examples of unacceptable behavior include but are not limited to: * Unwelcome physical contact * Unwelcome sexual or romantic attention or advances * Using CNCF projects or community spaces for political campaigning or promotion of political causes - that are unrelated to the advancement of cloud native technology. To clarify, this policy does not restrict individuals' personal attire, including attire that expresses personal beliefs or aspects of identity. + that are unrelated to the advancement of cloud native technology. To clarify, this policy does not restrict individuals' personal attire, including attire that expresses personal beliefs or aspects of identity +* The solicitation or encouragement of harmful mass criticism against an individual * Other conduct which could reasonably be considered inappropriate in a professional setting From 51cf3797bfe5f8cc57676f6bcda12591e0f76b51 Mon Sep 17 00:00:00 2001 From: Bill Mulligan Date: Thu, 4 Dec 2025 15:28:54 +0100 Subject: [PATCH 2/4] make wording more specific Signed-off-by: Bill Mulligan --- code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code-of-conduct.md b/code-of-conduct.md index c514b261..300ec8c1 100644 --- a/code-of-conduct.md +++ b/code-of-conduct.md @@ -72,7 +72,7 @@ Examples of unacceptable behavior include but are not limited to: * Unwelcome sexual or romantic attention or advances * Using CNCF projects or community spaces for political campaigning or promotion of political causes that are unrelated to the advancement of cloud native technology. To clarify, this policy does not restrict individuals' personal attire, including attire that expresses personal beliefs or aspects of identity -* The solicitation or encouragement of harmful mass criticism against an individual +* The solicitation or encouragement of targeted harassment or dog-piling against an individual * Other conduct which could reasonably be considered inappropriate in a professional setting From 5be650ad4cdc7b4b9e5da04895f6c1209f1d5d09 Mon Sep 17 00:00:00 2001 From: Bill Mulligan Date: Thu, 12 Feb 2026 11:57:59 -0600 Subject: [PATCH 3/4] clarify multiplier effect while preserving accountability Co-authored-by: Emily Fox <33327273+TheFoxAtWork@users.noreply.github.com> Signed-off-by: Bill Mulligan --- code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code-of-conduct.md b/code-of-conduct.md index 300ec8c1..68965bff 100644 --- a/code-of-conduct.md +++ b/code-of-conduct.md @@ -72,7 +72,7 @@ Examples of unacceptable behavior include but are not limited to: * Unwelcome sexual or romantic attention or advances * Using CNCF projects or community spaces for political campaigning or promotion of political causes that are unrelated to the advancement of cloud native technology. To clarify, this policy does not restrict individuals' personal attire, including attire that expresses personal beliefs or aspects of identity -* The solicitation or encouragement of targeted harassment or dog-piling against an individual +* The solicitation or encouragement of targeted or coordinated harassment against an individual. To clarify, the incitement, solicitation, and encouragement of this specific harm which may result in a multiplier effect. Professional, valid public awareness on accountability is not considered targeted or coordinated harassment. * Other conduct which could reasonably be considered inappropriate in a professional setting From 41d7a6a505de3a671690f4159b19435f4dfe6bef Mon Sep 17 00:00:00 2001 From: Bill Mulligan Date: Thu, 12 Feb 2026 11:58:35 -0600 Subject: [PATCH 4/4] bump version number --- code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code-of-conduct.md b/code-of-conduct.md index 68965bff..b9ca7e0f 100644 --- a/code-of-conduct.md +++ b/code-of-conduct.md @@ -1,4 +1,4 @@ -## CNCF Community Code of Conduct v1.3 +## CNCF Community Code of Conduct v1.4 Other languages available: - [Arabic/العربية](https://github.com/cncf/foundation/blob/main/code-of-conduct-languages/ar.md)