Skip to content

Merging to release-5.14.0: [TT-17515] Rename Tyk Classic hard_timeouts duration wire field (#8335)#8369

Closed
probelabs[bot] wants to merge 1 commit into
release-5.14.0from
merge/release-5.14.0/c8366aefc86cc61d96b90919db231d2093e03366/TT-17515
Closed

Merging to release-5.14.0: [TT-17515] Rename Tyk Classic hard_timeouts duration wire field (#8335)#8369
probelabs[bot] wants to merge 1 commit into
release-5.14.0from
merge/release-5.14.0/c8366aefc86cc61d96b90919db231d2093e03366/TT-17515

Conversation

@probelabs

@probelabs probelabs Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

Cherry-pick of c8366aefc86cc61d96b90919db231d2093e03366 from master to release-5.14.0 requires manual resolution.

Conflicts detected: 0

Tips:

  • Check out this branch locally and run: git cherry-pick -x c8366aefc86cc61d96b90919db231d2093e03366
  • Resolve conflicts (including submodules if any), then push back to this branch.

Original commit: c8366ae

    Cherry-pick failed with conflicts and requires manual resolution.
    This empty commit exists to allow opening a draft PR.
@sentinelone-cnapp-eu1

Copy link
Copy Markdown

SentinelOne CNS Hardcoded Secret Detector
✅ Congratulations, your code is safe

SentinelOne CNS is a cloud-agnostic, agentless CSPM & CWPP solution that continuously detects and prevents vulnerabilities that have the highest probability of being exploited in Azure, AWS, Google Cloud, and Kubernetes.

@github-actions

Copy link
Copy Markdown
Contributor

🎯 Recommended Merge Targets

Based on JIRA ticket TT-17515: Granular Endpoint Enforced Timeout for Tyk Classic API

Fix Version: Tyk 5.14.0

Required:

  • release-5.14.0 - Exact version branch for Tyk 5.14.0 - specific patch release
  • master - Main development branch - ensures fix is in all future releases

Recommended:

  • release-5.14 - Minor version branch for 5.14.x releases

📋 Workflow

  1. Merge this PR to master first

  2. Cherry-pick to release branches by commenting on the merged PR:

    • /release to release-5.14.0
    • /release to release-5.14
  3. Automated backport - The bot will automatically create backport PRs to the specified release branches

@mativm02
mativm02 marked this pull request as ready for review June 25, 2026 12:05
@mativm02
mativm02 enabled auto-merge (squash) June 25, 2026 12:10
@mativm02

Copy link
Copy Markdown
Contributor

Closing as redundant — no backport work required for TT-17515 on release-5.14.0.

The source commit c8366aefc86cc61d96b90919db231d2093e03366 is already present in release-5.14.0 (it appears with the same SHA directly in the branch history), so a cherry-pick produces nothing. Verified locally:

git checkout <this branch>
git cherry-pick -x c8366aefc86cc61d96b90919db231d2093e03366
# → "The previous cherry-pick is now empty … nothing to commit, working tree clean"

This branch contained only the bot's empty placeholder commit; the PR was "blocked" because the test job is skipped (no real change), failing the aggregate CI gate — not due to any merge conflict. The renamed wire field (json:"duration" / test JSON key "duration") is already on release-5.14.0.

@mativm02 mativm02 closed this Jun 25, 2026
auto-merge was automatically disabled June 25, 2026 12:12

Pull request was closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-manual-cherry-pick Cherry-pick has conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant