Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat(api): enable JFR Snapshot #186

Merged
merged 9 commits into from
Sep 13, 2023
Merged

feat(api): enable JFR Snapshot #186

merged 9 commits into from
Sep 13, 2023

Conversation

mwangggg
Copy link
Member

@mwangggg mwangggg commented Aug 16, 2023 •
edited
Loading

fixes: #185
fixes: #162
Related to: #124

@mwangggg mwangggg force-pushed the http-recording-snapshot branch from 80ed059 to 08138a3 Compare August 16, 2023 15:59
@mwangggg mwangggg added the feat New feature or request label Aug 16, 2023
@mwangggg mwangggg marked this pull request as ready for review August 22, 2023 14:43
@andrewazores andrewazores mentioned this pull request Aug 23, 2023
Merged
7 tasks
@mwangggg mwangggg force-pushed the http-recording-snapshot branch from 0e83c3f to 805d0a3 Compare August 24, 2023 14:17
@mwangggg mwangggg requested a review from ebaron as a code owner August 24, 2023 14:17
@andrewazores
Copy link
Member

Looks like a bad rebase or something. git fetch upstream && git rebase -i upstream/124-epic-two-way-communications-protocol, drop all commits that aren't ones you authored directly for this PR, and force-push back onto your branch.

@mwangggg mwangggg force-pushed the http-recording-snapshot branch from 805d0a3 to cced276 Compare August 24, 2023 14:25
@mwangggg
Copy link
Member Author

not really sure what happened there... my laptop has been bugging all morning

@andrewazores
Copy link
Member

git rebase main would have done something like that, I think. Easy mistake to make when working with upstream feature branches like this. Ideally I would have been keeping that one up to date with main, but I'll have to get around to it after this is merged.

@mwangggg mwangggg force-pushed the http-recording-snapshot branch from 3d487c7 to f604548 Compare August 31, 2023 20:56
@andrewazores
Copy link
Member

Rebase onto upstream/124-epic-two-way-communication, not main

@mwangggg mwangggg force-pushed the http-recording-snapshot branch from f604548 to 43d1201 Compare September 1, 2023 15:39
@mwangggg mwangggg force-pushed the http-recording-snapshot branch from 43d1201 to 2cc7720 Compare September 1, 2023 15:43
@mergify mergify bot added the safe-to-test label Sep 6, 2023
@andrewazores andrewazores merged commit 8aba821 into cryostatio:124-epic-two-way-communications-protocol Sep 13, 2023
This was referenced Sep 13, 2023
Closed
Merged
@mwangggg mwangggg deleted the http-recording-snapshot branch September 13, 2023 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrewazores andrewazores andrewazores approved these changes

@ebaron ebaron Awaiting requested review from ebaron

Assignees
No one assigned
Labels
feat New feature or request safe-to-test
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mwangggg @andrewazores