From afa85da149039e5eb5c7895438cd563184e70fbe Mon Sep 17 00:00:00 2001
From: Dirk Pranke <dpranke@google.com>
Date: Thu, 22 Apr 2021 16:48:37 +0000
Subject: [PATCH] Update contact information in the Code of Conduct.

Currently the Code of Conduct doc lists both a mailing list
and two individuals. The individual contacts change over time,
and so it's probably not that useful to list them directly.
This change updates the page to just list the mailing list.

Change-Id: I37d49cab65ed8147ee3db448165ad5f1a4129911
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2808601
Reviewed-by: Rachel Blum <groby@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Reviewed-by: Mike Pinkerton <pinkerton@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#875211}
---
 CODE_OF_CONDUCT.md | 7 +++----
 OWNERS             | 3 ++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index b747d2f9f77d5..23b3b1605c4fb 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -32,10 +32,9 @@ they are doing - politely bringing their behavior to their attention is
 encouraged.
 
 If you are uncomfortable speaking up, or feel that your concerns are not being
-duly considered, you can email community@chromium.org, dpranke@chromium.org, or
-groby@chromium.org to request involvement from a community manager. All
-concerns shared with community managers will be kept confidential, but you may
-also submit an anonymous report [here](https://docs.google.com/a/google.com/forms/d/e/1FAIpQLSe-LDjW9eIJ-TpI2poZxnGtU-SvUWkFZc8x0aiKGY1s7NKPdA/viewform?c=0&w=1).
+duly considered, you can email community@chromium.org to request involvement
+from a community manager. All concerns shared with community managers will be
+kept confidential, but you may also submit an anonymous report [here](https://docs.google.com/a/google.com/forms/d/e/1FAIpQLSe-LDjW9eIJ-TpI2poZxnGtU-SvUWkFZc8x0aiKGY1s7NKPdA/viewform?c=0&w=1).
 Please note that without a way to contact you, an anonymous report may be
 difficult to act on. You may also create a throwaway account to report. In
 cases where a public response is deemed necessary, the identities of victims
diff --git a/OWNERS b/OWNERS
index 2ae3a12b58dde..6cacb18bd8b28 100644
--- a/OWNERS
+++ b/OWNERS
@@ -18,7 +18,8 @@ per-file .vpython*=iannucci@chromium.org
 per-file .yapfignore=*
 per-file AUTHORS=*
 per-file CODE_OF_CONDUCT.md=dpranke@google.com
-per-file CODE_OF_CONDUCT.md=groby@chromium.org
+per-file CODE_OF_CONDUCT.md=benhenry@chromium.org
+per-file CODE_OF_CONDUCT.md=ellyjones@chromium.org
 per-file DEPS=*
 per-file PRESUBMIT*.py=agrieve@chromium.org  # For .pydeps changes
 per-file PRESUBMIT*.py=dcheng@chromium.org