Skip to content

Merge updates from master branch into stix2.1 branch#172

Merged
ejratl merged 4 commits intostix2.1from
master
Jan 19, 2026
Merged

Merge updates from master branch into stix2.1 branch#172
ejratl merged 4 commits intostix2.1from
master

Conversation

@ejratl
Copy link
Copy Markdown
Contributor

@ejratl ejratl commented Jan 19, 2026

It turns out that it is not sufficient to merge changes into master if the stix validator relies on them because the default instructions cause the cti-stix2-json-schemas repo which is a git submodule of the stix validator to switch to the stix2.1 branch. So this PR is needed before oasis-open/cti-stix-validator#243 can be merged.

@ejratl ejratl merged commit c4f8d58 into stix2.1 Jan 19, 2026
3 checks passed
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