Merge "pylint: support multiple pylintrc files per-repo" into main
diff --git a/OWNERS b/OWNERS
index 0280764..8e52c19 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,8 @@
+rrangel@google.com
+saklein@google.com
+sfrolov@google.com
+tbain@google.com
vapier@google.com
-samccone@google.com
+zland@google.com
+
+samccone@google.com #{LAST_RESORT_SUGGESTION}
diff --git a/README.md b/README.md
index 23adc8c..c1ac4fc 100644
--- a/README.md
+++ b/README.md
@@ -205,7 +205,7 @@
* `ktfmt`: Run Kotlin code through `ktfmt`. Supports an additional option
--include-dirs, which if specified will limit enforcement to only files under
the specified directories.
-* `pylint`: Alias of `pylint2`. Will change to `pylint3` by end of 2019.
+* `pylint`: Alias of `pylint3`.
* `pylint2`: Run Python code through `pylint` using Python 2.
* `pylint3`: Run Python code through `pylint` using Python 3.
* `rustfmt`: Run Rust code through `rustfmt`.
diff --git a/rh/hooks.py b/rh/hooks.py
index 453f74e..ae0ea51 100644
--- a/rh/hooks.py
+++ b/rh/hooks.py
@@ -1076,7 +1076,7 @@
'google_java_format': check_google_java_format,
'jsonlint': check_json,
'ktfmt': check_ktfmt,
- 'pylint': check_pylint2,
+ 'pylint': check_pylint3,
'pylint2': check_pylint2,
'pylint3': check_pylint3,
'rustfmt': check_rustfmt,