[13:12:09] <marostegui>	 bjensen: https://gerrit.wikimedia.org/r/c/labs/private/+/1315832 that is pending to be merged in puppet
[13:12:31] <bjensen>	 oh sorry about that
[13:12:46] <marostegui>	 bjensen: it is okay, you want me to merge?
[13:12:51] <bjensen>	 that would be great, thanks
[13:12:55] <marostegui>	 doing it
[13:13:04] <bjensen>	 i've not merged in labs/private before, is that the same process as the regular puppet-merge?
[13:14:40] <sukhe>	 yep
[13:14:49] <bjensen>	 gotcha, thanks - will remember that for next time
[13:52:30] <_joe_>	 bjensen: dw we all forget it from time to time :)
[13:55:40] <cdanis>	 the ergonomics are really horrible
[14:18:16] <Emperor>	 IWNI gerrit could pop up a "remember to puppet-merge" where relevant
[14:20:32] <moritzm>	 it's not unlikely that existing docs are also wrong; we used to auto-merge labs-private until a few years ago, wouldn't be surprised to see that still documented on wikitech
[16:15:24] <cdanis>	 why *is* labs/private a separate repo anyway?
[16:17:02] <cdanis>	 it maybe made sense when it was merged automatically and separately
[16:17:32] <cdanis>	 if we're sticking with 'labs/private changes require a puppet-merge', why not just make a hieradata/dummy_secrets/ subtree inside the puppet repo itself
[16:18:06] <bjensen>	 i would have found that structure more intuitive
[16:18:25] <cdanis>	 I don't know if there's any other actual reason for the separation
[16:18:30] <cdanis>	 it pre-dates me by a lot :)
[16:20:20] <cdanis>	 there are some ACL differences, but, they mostly look trivial or irrelevant or both
[16:21:01] <taavi>	 surely it's been more than 'a few years' since that was changed? I think I've been around for that long and as long as I've been following it has required puppet-merges
[16:55:41] <sukhe>	 hnowlan: <3 for https://gerrit.wikimedia.org/r/c/operations/alerts/+/1325528
[16:59:44] <hnowlan>	 np!
[19:32:47] <Krinkle>	 Raine: re https://phabricator.wikimedia.org/T432983 - what do you mean by upstream there?
[19:33:08] <Krinkle>	 wmerrors is one of ours :)
[19:36:13] <Krinkle>	 oh TIL it got submitted to Debian - https://packages.debian.org/stable/php-wmerrors
[19:36:19] <Krinkle>	 right, that one isn't on 2.1.0 yet
[19:36:35] <Krinkle>	 I guess sury hasn't gotten around to that yet, maybe because it failed previously
[20:59:31] <Krinkle>	 hm.. no this one isn't maintained by sury
[20:59:37] <Krinkle>	 mediawiki-team :D https://salsa.debian.org/mediawiki-team/php-wmerrors
[20:59:38] <Krinkle>	 of course.
[23:31:54] <Reedy>	 Krinkle: And t.aavi only tagged 2.1.0 earlier today too ;)