jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392461 )

Change subject: keys: Document which key is which in keys.txt
......................................................................


keys: Document which key is which in keys.txt

This will make further maintenance much easier, and `gpg --import`
should continue to work fine.

Change-Id: I71b172927c844ad31c72354c8030f4c91ed29139
---
M docroot/mediawiki/keys/keys.txt
1 file changed, 22 insertions(+), 0 deletions(-)

Approvals:
  Chad: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/docroot/mediawiki/keys/keys.txt b/docroot/mediawiki/keys/keys.txt
index 7a1a92f..cbdec26 100644
--- a/docroot/mediawiki/keys/keys.txt
+++ b/docroot/mediawiki/keys/keys.txt
@@ -1,3 +1,11 @@
+Tim Starling <[email protected]>
+D7D6767D135A514BEB86E9BA75682B08E8A3FEC4
+Brion Vibber <[email protected]>
+441276E9CCD15F44F6D97D18C119E1A64D70938E
+Tim Starling <[email protected]>
+F7F780D82EBFB8A56556E7EE82403E59F9F8CD79
+Sam Reed <[email protected]>
+1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
@@ -123,6 +131,8 @@
 =UPzx
 -----END PGP PUBLIC KEY BLOCK-----
 
+Brion Vibber <[email protected]>
+441276E9CCD15F44F6D97D18C119E1A64D70938E
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
@@ -162,6 +172,8 @@
 =T2xL
 -----END PGP PUBLIC KEY BLOCK-----
 
+Sam Reed <[email protected]>
+1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
@@ -193,6 +205,8 @@
 =kbNd
 -----END PGP PUBLIC KEY BLOCK-----
 
+Chris Steipp <[email protected]>
+162432D9E81C1C618B301EECEE1F663462D84F01
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
@@ -233,6 +247,8 @@
 =XRoj
 -----END PGP PUBLIC KEY BLOCK-----
 
+Mark A. Hershberger <[email protected]>
+3CEF8262806D3F0B6BA1DBDD7956EE477F901A30
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
@@ -270,6 +286,8 @@
 =f8Nf
 -----END PGP PUBLIC KEY BLOCK-----
 
+Markus Glaser <[email protected]>
+280DB7845A1DCAC92BB5A00A946B02565DC00AA7
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.4.13 (MingW32)
 
@@ -301,6 +319,8 @@
 =vhcr
 -----END PGP PUBLIC KEY BLOCK-----
 
+Chad Horohoe <[email protected]>
+41B2ABE817ADD3E52BDA946F72BC1C5D23107F8A
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
 Comment: GPGTools - https://gpgtools.org
@@ -347,6 +367,8 @@
 =ysCu
 -----END PGP PUBLIC KEY BLOCK-----
 
+Tyler Cipriani <[email protected]>
+6237D8D3ECC1AE918729296FF6DAD285018FAC02
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG/MacGPG2 v2
 Comment: GPGTools - https://gpgtools.org

-- 
To view, visit https://gerrit.wikimedia.org/r/392461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I71b172927c844ad31c72354c8030f4c91ed29139
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Brian Wolff <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Urbanecm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to