summaryrefslogtreecommitdiff
path: root/Tools/Scripts/webkitpy/common/config
diff options
context:
space:
mode:
Diffstat (limited to 'Tools/Scripts/webkitpy/common/config')
-rw-r--r--Tools/Scripts/webkitpy/common/config/committers.py8
-rwxr-xr-xTools/Scripts/webkitpy/common/config/watchlist2
2 files changed, 5 insertions, 5 deletions
diff --git a/Tools/Scripts/webkitpy/common/config/committers.py b/Tools/Scripts/webkitpy/common/config/committers.py
index bda102e11..1030de694 100644
--- a/Tools/Scripts/webkitpy/common/config/committers.py
+++ b/Tools/Scripts/webkitpy/common/config/committers.py
@@ -93,7 +93,7 @@ class Reviewer(Committer):
watchers_who_are_not_contributors = [
- Account("Chromium Compositor Bugs", ["cc-bugs@google.com"], ""),
+ Account("Chromium Compositor Bugs", ["cc-bugs@chromium.org"], ""),
Account("Chromium Media Reviews", ["feature-media-reviews@chromium.org"], ""),
Account("David Levin", ["levin+threading@chromium.org"], ""),
Account("David Levin", ["levin+watchlist@chromium.org"], ""),
@@ -189,7 +189,7 @@ committers_unable_to_review = [
Committer("Alexandre Elias", ["aelias@chromium.org", "aelias@google.com"], "aelias"),
Committer("Alexandru Chiculita", "achicu@adobe.com", "achicu"),
Committer("Alice Boxhall", "aboxhall@chromium.org", "aboxhall"),
- Committer("Allan Sandfeld Jensen", ["allan.jensen@nokia.com", "kde@carewolf.com", "sandfeld@kde.org"], "carewolf"),
+ Committer("Allan Sandfeld Jensen", ["allan.jensen@digia.com", "kde@carewolf.com", "sandfeld@kde.org", "allan.jensen@nokia.com"], "carewolf"),
Committer("Alok Priyadarshi", "alokp@chromium.org", "alokp"),
Committer("Ami Fischman", ["fischman@chromium.org", "fischman@google.com"], "fischman"),
Committer("Amruth Raj", "amruthraj@motorola.com", "amruthraj"),
@@ -330,7 +330,7 @@ committers_unable_to_review = [
Committer("Matt Perry", "mpcomplete@chromium.org"),
Committer("Maxime Britto", ["maxime.britto@gmail.com", "britto@apple.com"]),
Committer("Maxime Simon", ["simon.maxime@gmail.com", "maxime.simon@webkit.org"], "maxime.simon"),
- Committer(u"Michael Br\u00fcning", ["michaelbruening@gmail.com", "michael.bruning@nokia.com"], "mibrunin"),
+ Committer(u"Michael Br\u00fcning", ["michaelbruening@gmail.com", "michael.bruning@digia.com", "michael.bruning@nokia.com"], "mibrunin"),
Committer("Michael Nordman", "michaeln@google.com", "michaeln"),
Committer("Michelangelo De Simone", "michelangelo@webkit.org", "michelangelo"),
Committer("Mihnea Ovidenie", "mihnea@adobe.com", "mihnea"),
@@ -479,7 +479,7 @@ reviewers_list = [
Reviewer("Jeremy Orlow", ["jorlow@webkit.org", "jorlow@chromium.org"], "jorlow"),
Reviewer("Jessie Berlin", ["jberlin@webkit.org", "jberlin@apple.com"], "jessieberlin"),
Reviewer("Jian Li", "jianli@chromium.org", "jianli"),
- Reviewer("Jocelyn Turcotte", "jocelyn.turcotte@nokia.com", "jturcotte"),
+ Reviewer("Jocelyn Turcotte", ["jocelyn.turcotte@digia.com", "jocelyn.turcotte@nokia.com"], "jturcotte"),
Reviewer("Jochen Eisinger", "jochen@chromium.org", "jochen__"),
Reviewer("John Sullivan", "sullivan@apple.com", "sullivan"),
Reviewer("Jon Honeycutt", "jhoneycutt@apple.com", "jhoneycutt"),
diff --git a/Tools/Scripts/webkitpy/common/config/watchlist b/Tools/Scripts/webkitpy/common/config/watchlist
index 4029fe8d5..2ab16b0c2 100755
--- a/Tools/Scripts/webkitpy/common/config/watchlist
+++ b/Tools/Scripts/webkitpy/common/config/watchlist
@@ -246,7 +246,7 @@
"BlackBerry": [ "mifenton@rim.com", "rwlbuis@gmail.com" ],
"CMake": [ "rakuco@webkit.org", "gyuyoung.kim@samsung.com" ],
"CSS": [ "alexis@webkit.org", "macpherson@chromium.org", "cmarcelo@webkit.org" ],
- "ChromiumGraphics": [ "jamesr@chromium.org", "cc-bugs@google.com" ],
+ "ChromiumGraphics": [ "jamesr@chromium.org", "cc-bugs@chromium.org" ],
"ChromiumPublicApi": [ "abarth@webkit.org", "dglazkov@chromium.org", "fishd@chromium.org", "jamesr@chromium.org", "tkent+wkapi@chromium.org" ],
"DOMAttributes": [ "cmarcelo@webkit.org", ],
"EFL": [ "rakuco@webkit.org", "gyuyoung.kim@samsung.com" ],