Fixed merge conflicts

Browse Source

...

This commit is contained in:

frikky

2023-07-06 17:39:40 +02:00

parent 6e405e781c 77a59537bd

commit 38fe58f1b6

209 changed files with 1826 additions and 68 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

functions/extensions/cortex-responders/Shuffle/requirements.txt

Regular → Executable

functions/extensions/cortex-responders/Shuffle/shuffle.json

Regular → Executable

functions/extensions/cortex-responders/Shuffle/shuffle.py

Regular → Executable

functions/extensions/cortex-responders/Shuffle_Webhook/requirements.txt

Regular → Executable

functions/extensions/cortex-responders/Shuffle_Webhook/shuffle_webhook.json

Regular → Executable

functions/extensions/cortex-responders/Shuffle_Webhook/shuffle_webhook.py

Regular → Executable

functions/extensions/elasticsearch/run.sh

Regular → Executable

functions/extensions/k8s/shuffle/.helmignore

Regular → Executable

functions/extensions/k8s/shuffle/Chart.yaml

Regular → Executable

functions/extensions/k8s/shuffle/templates/NOTES.txt

Regular → Executable

functions/extensions/k8s/shuffle/templates/_helpers.tpl

Regular → Executable

functions/extensions/k8s/shuffle/templates/deployment.yaml

Regular → Executable

functions/extensions/k8s/shuffle/templates/hpa.yaml

Regular → Executable

functions/extensions/k8s/shuffle/templates/ingress.yaml

Regular → Executable

functions/extensions/k8s/shuffle/templates/persistent-volume.yaml

Regular → Executable

functions/extensions/k8s/shuffle/templates/persistentvolumeclaim.yaml

Regular → Executable

functions/extensions/k8s/shuffle/templates/service.yaml

Regular → Executable

functions/extensions/k8s/shuffle/templates/serviceaccount.yaml

Regular → Executable

functions/extensions/k8s/shuffle/templates/tests/test-connection.yaml

Regular → Executable

functions/extensions/k8s/shuffle/values.yaml

Regular → Executable

functions/extensions/misp/Dockerfile

Regular → Executable

functions/extensions/misp/docker-compose.yml

Regular → Executable

functions/extensions/misp/requirements.txt

Regular → Executable

functions/extensions/misp/sub.py

Regular → Executable

functions/extensions/scripts/disable_disk_check.sh

Regular → Executable

functions/extensions/wazuh/custom-shuffle

Regular → Executable

functions/extensions/wazuh/custom-shuffle.py

Regular → Executable

functions/extensions/wazuh/ossec.conf

Regular → Executable