Skip to content

Csp merge#1

Closed
orouz wants to merge 289 commits into
mainfrom
csp_merge
Closed

Csp merge#1
orouz wants to merge 289 commits into
mainfrom
csp_merge

Conversation

@orouz

@orouz orouz commented Sep 6, 2023

Copy link
Copy Markdown
Owner

cloudbeat:

git fetch upstream/main
git co -b csp_merge upstream/main
git remote add csp git@github.com:elastic/csp-security-policies.git
git merge -sours --no-commit csp/main --allow-unrelated-histories
git read-tree --prefix=policies/ -u csp/main

oren-zohar and others added 30 commits November 11, 2021 17:19
Master Node Configuration File permissions rules
Rename blank.yml to test-coverage.yml

Update test-coverage.yml

Update test-coverage.yml

Update README.md

Update test-coverage.yml

Update test-coverage.yml

Update test-coverage.yml

Update test-coverage.yml

Update test-coverage.yml

Update test-coverage.yml

Delete test-coverage.yml

Update test-policies.yml

Update test-policies.yml

Update test-policies.yml

Update test-policies.yml

Update test-policies.yml

Update test-policies.yml

Update test-policies.yml

Update test-policies.yml

Update test-policies.yml

Update test-policies.yml

Update test-policies.yml

Update test-policies.yml

Update test-policies.yml

Update test-policies.yml

Update test-policies.yml
Update README.md

Update test-policies.yml
@orouz orouz force-pushed the csp_merge branch 2 times, most recently from bb647be to 91166de Compare September 16, 2023 12:18
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.