github-table timeout extension - #1006
Merged
Merged
Conversation
Signed-off-by: Kristin Brown <kristin.brown@solo.io>
Deploying agentproxy with
|
| Latest commit: |
34447aa
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://d42a2b23.agentproxy.pages.dev |
| Branch Preview URL: | https://kkb-timeout-ext.agentproxy.pages.dev |
Nadine2016
approved these changes
Sep 1, 2026
artberger
added a commit
that referenced
this pull request
Sep 1, 2026
…yout main moved on while this branch was open — most substantially PR #990 ("Observability updates for Kubernetes"), which restructured observability at the PRE-docTabs paths, plus #998, #1006 and the timeout/agentcore edits. Resolved by rule rather than by hand, because the two changes are orthogonal: main's CONTENT wins for every file it touched, and this branch's LOCATION wins. All 63 of main's content changes were re-applied at their docTabs path — for these, `<version>/observability/…` becomes `<version>/documentation/observability/…` — and this branch's transformations (the tab path prefix, the Integrations regrouping, icon removal) were re-applied on top. Nothing of this branch's own work is lost that way, because its edits to those files were only path rewrites and icon removal. The trap here is not the 30 conflicts, it is the files that merge CLEANLY. Most of main's new observability pages had no counterpart on this branch, so git happily added them at `<version>/observability/…` — a path that is outside every tab in this layout, where they would render with no tab band and no nav. 35 such duplicates were removed after their content was applied at the correct path. Two files needed manual repair, both from git pairing a `latest` file of main's against an ARCHIVED file of this branch by rename detection: - 1.3.x/documentation/observability/_index.md (left conflict markers) - 1.3.x/documentation/observability/otel-stack.md (mis-merged SILENTLY) Both restored from this branch's side; main never touched 1.3.x. The silent one was caught by diffing every archived version root against the pre-merge commit, which is now the check to run after any merge into this branch — archived roots must come out byte-identical. Note the conflict markers were eight brackets deep, not seven, so a `^<<<<<<< ` grep misses them. Verified: hugo builds clean, and an internal link check finds the same 44 dead links as origin/main built at the same commit — no regressions. (Main itself went from 23 to 44; the 21 new ones arrived with #990/#1006 and are not addressed here.) Signed-off-by: Art Berger <art.berger@solo.io>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The whole table has to be retrieved, even just to get a subset of the content. And it's too long and timing out sometimes.