summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2019-10-25 15:20:31 +0200
committerGitHub <noreply@github.com>2019-10-25 15:20:31 +0200
commit57e05cf7268b81754d5dcbdf99595ac1df2d4353 (patch)
tree9cbbc4e124bac5b5c958df70887723741294a6cb
parent69e676c3b59d9ebe38690242dfb0dd0ff4d11d38 (diff)
parentac44988ab0d6df49976b95551c55c04f115e7078 (diff)
Merge pull request #167 from nikomatsakis/sync-lang-team
sync lang team
-rw-r--r--teams/alumni.toml3
-rw-r--r--teams/lang-shepherds.toml9
-rw-r--r--teams/lang.toml5
3 files changed, 6 insertions, 11 deletions
diff --git a/teams/alumni.toml b/teams/alumni.toml
index 4e4a479..be94956 100644
--- a/teams/alumni.toml
+++ b/teams/alumni.toml
@@ -22,7 +22,10 @@ members = [
"jseyfried",
"pcwalton",
"peschkaj",
+ "rpjohnst",
+ "solson",
"tomprince",
+ "whitequark",
"wycats",
]
diff --git a/teams/lang-shepherds.toml b/teams/lang-shepherds.toml
deleted file mode 100644
index 9a81f10..0000000
--- a/teams/lang-shepherds.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-name = "lang-shepherds"
-
-[people]
-leads = []
-members = [
- "solson",
- "whitequark",
- "rpjohnst",
-]
diff --git a/teams/lang.toml b/teams/lang.toml
index d202819..0301e69 100644
--- a/teams/lang.toml
+++ b/teams/lang.toml
@@ -17,6 +17,9 @@ members = [
perf = true
bors.rust.review = true
+[github]
+orgs = ["rust-lang", "rust-lang-nursery"]
+
[rfcbot]
label = "T-lang"
name = "Language"
@@ -32,8 +35,6 @@ address = "lang-private@rust-lang.org"
[[lists]]
address = "lang@rust-lang.org"
-extra-teams = ["lang-shepherds"]
[[lists]]
address = "language-design-team@rust-lang.org"
-extra-teams = ["lang-shepherds"]