Skip to content

chore(sync): reconcile develop and beta - #659

Merged
Starosdev merged 17 commits into
developfrom
codex/sync-beta-from-develop-20260715
Jul 15, 2026
Merged

Starosdev merged 17 commits into
developfrom
codex/sync-beta-from-develop-20260715

Conversation

@Starosdev

Copy link
Copy Markdown
Owner

Summary

  • Reconcile the current develop and beta histories in one conflict-free merge.
  • Bring the latest develop work, including the InfluxDB 2.9 update, into the combined branch.
  • Retain the v1.66.0 release metadata and ATA SSD threshold fix already present on beta and master.

Linked Issues

Test plan

  • go test ./webapp/backend/pkg/models/measurements ./pkg/startup ./collector/pkg/mdadm/detect
  • git diff --check
  • Confirmed the Docker workflow for current develop completed successfully before opening this sync PR.
  • Run the full PR CI suite.

@Starosdev
Starosdev merged commit cf5cb57 into develop Jul 15, 2026
15 checks passed
@Starosdev

Copy link
Copy Markdown
Owner Author

Merged (2026-07-15)

Changes Made

  1. Reconciled develop and beta
    • Combined the latest integration work with the v1.66.0 release history.
    • Retained the ATA SSD threshold fix already present on beta and master.
  2. Validated the synchronized tree
    • Focused Go tests and git diff --check passed locally.
    • All 12 required CI and security checks passed.
    • develop and beta now point to the same commit.
PR #659
Release N/A (branch synchronization)
Docker ghcr.io/starosdev/scrutiny:develop-omnibus, ghcr.io/starosdev/scrutiny:beta-omnibus

Branch synchronization complete.

@Starosdev
Starosdev deleted the codex/sync-beta-from-develop-20260715 branch July 15, 2026 17:28
@Starosdev Starosdev mentioned this pull request Jul 16, 2026
6 tasks done
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.

2 participants