-
Notifications
You must be signed in to change notification settings - Fork 4.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
backports for Activitylog and Reporting 1.12.x #21133
Conversation
4552efd
to
bc283b0
Compare
bc283b0
to
3daf087
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's a lot here to go through, especially for a backport. I did my best to sort through it, and to my eyes, it looks correct.
5da4a93
to
47d9c63
Compare
While going through the backport, there were 4 classes of commits (marked below):
❌ 50a1f9e fix off by one err in current month client count computation (#17457) |
Here's a bit more insight into the diff between the 1.12 backports and main: https://gist.github.com/mpalmi/817616ae97ddd5b2a5b90004bf766c23 |
47d9c63
to
10a4726
Compare
10a4726
to
2a315f5
Compare
2a315f5
to
89247a2
Compare
This PR encapsulates the backports for Census and ActivityLog changes to get the release branches in sync and should resolve VAULT-14702 and VAULT-14765 along with the backports for the new client count testing library.
It was easier to backport the changes en masse, since they're all intertwined. Teasing apart feature-specific changes would have been more difficult.
Commits were prepared using (with fish shell,
$()
is just()
):and editorialized/reworded using interactive rebase. The ACME-related changes (including testing of the
clientType
proto field via the client count testing library) were not backported.Apologies for the large PR. It may be easiest to review by comparing each backport commit with the original. I can split this up if others think it's worthwhile.
Diff between backport and main
https://gist.github.com/mpalmi/8cbb375f8616a8b1237e5189490ff23e