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.

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

Merge main into porch #2750

Merged
merged 7 commits into from
Feb 7, 2022
Merged

Merge main into porch #2750

merged 7 commits into from
Feb 7, 2022

Conversation

martinmaly
Copy link
Contributor

rquitales and others added 6 commits February 3, 2022 17:03
* Fix test flake from timestamp sanitization

When timestamps "overlap", sanitization did not work correctly.

For example:

in 1s ... in 2.1s

The first substitution would replace 1s => 0s

in 0s ... in 2.0s

The second substitution is predetermined, and replaces 2.1s => 0s, but
2.1s is no longer in the string.

* Use new sanitization function in tests, remove old function
merging this as an MVP and will iterate based on additional requests and customer feedback.
@justinsb
Copy link
Contributor

justinsb commented Feb 5, 2022

lgtm - please just call out if any fixup PRs were needed for the merge, but otherwise I'm going to treat these as mechanical

@martinmaly martinmaly merged commit d6824f6 into kptdev:porch Feb 7, 2022
@martinmaly martinmaly deleted the merge branch February 7, 2022 21:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants