-
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.13.x #21140
Conversation
1c2e47d
to
09e7797
Compare
|
6151934
to
a3e7e81
Compare
When I ran your Also, the |
While going through the backport, there were 4 classes of commits (marked below):
It would probably be better if I had kept track of the 4 separate buckets so I could distinguish them, but for the purposes of this PR, separating by ❌ and ✅ seems sufficient. Note: I will do something similar for the 1.11.x and 1.13.x PRs, if you think it's helpful. ❌ a9e17c2 VAULT-13763 normalize activity log mount paths (#19343)
That's right, I used it as a general heuristic for selecting the appropriate commits (with some extra post-processing). I think the changes this PR addresses were all contained within |
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.
b75e69b
to
627d3f9
Compare
627d3f9
to
f2a62da
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/72d7f39c3d190ec660e0795419004545