Skip to content

fix: remove files accidentally merged in #950#953

Merged
mattisonchao merged 2 commits into
mainfrom
fix/remove-accidental-files-from-950
Mar 20, 2026
Merged

fix: remove files accidentally merged in #950#953
mattisonchao merged 2 commits into
mainfrom
fix/remove-accidental-files-from-950

Conversation

@mattisonchao

Copy link
Copy Markdown
Member

Motivation

PR #950 (buger/jsonparser bump) accidentally included unrelated files from a dirty working tree during a merge conflict resolution.

Modification

  • Remove SHARD_SPLIT_DESIGN.md and TRANSACTION_DESIGN.md design docs
  • Remove data.BACKUP/ directory containing WAL data files
  • Remove config.yaml and kind-config.yaml
  • Remove kube-prometheus-stack/ Helm chart directory (CRDs, Grafana dashboards, templates, etc.)

PR #950 (buger/jsonparser bump) included unrelated files from a dirty
working tree: design docs, WAL data backups, and an entire
kube-prometheus-stack Helm chart.

Signed-off-by: mattisonchao <[email protected]>
@mattisonchao
mattisonchao force-pushed the fix/remove-accidental-files-from-950 branch from e4d743f to f5cc723 Compare March 20, 2026 05:52
@mattisonchao
mattisonchao merged commit c86e094 into main Mar 20, 2026
9 checks passed
@mattisonchao
mattisonchao deleted the fix/remove-accidental-files-from-950 branch March 20, 2026 06:01
mattisonchao added a commit that referenced this pull request Mar 20, 2026
### Motivation

Follow-up to #953 — additional files from the dirty working tree in #950
were missed in the first cleanup.

### Modification

- Remove `oxia-cluster.yaml`, `oxia.zsh`, `perf.yaml`, `sm.yaml`,
`test.json`, `test.yaml`
- Remove `maelstrom` binary (75MB)

Signed-off-by: mattisonchao <[email protected]>
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