Skip to content

Commit 25016e8

Browse files
committed
conflicts
2 parents aa23a18 + a17707f commit 25016e8

File tree

93 files changed

+421
-498
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+421
-498
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "contentctl"]
22
path = contentctl
33
url = https://github.com/splunk/contentctl.git
4-
ignore = all
4+
ignore = all

dist/DA-ESS-ContentUpdate/default/analyticstories.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#############
22
# Automatically generated by generator.py in splunk/security_content
3-
# On Date: 2023-12-06T21:36:36 UTC
3+
# On Date: 2023-12-06T21:50:43 UTC
44
# Author: Splunk Threat Research Team - Splunk
55
66
#############

dist/DA-ESS-ContentUpdate/default/app.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#############
22
# Automatically generated by generator.py in splunk/security_content
3-
# On Date: 2023-12-06T21:36:36 UTC
3+
# On Date: 2023-12-06T21:50:43 UTC
44
# Author: Splunk Threat Research Team - Splunk
55
66
#############
@@ -10,7 +10,7 @@
1010
is_configured = false
1111
state = enabled
1212
state_change_requires_restart = false
13-
build = 20231206213413
13+
build = 20231206214848
1414

1515
[triggers]
1616
reload.analytic_stories = simple

dist/DA-ESS-ContentUpdate/default/collections.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#############
22
# Automatically generated by generator.py in splunk/security_content
3-
# On Date: 2023-12-06T21:36:36 UTC
3+
# On Date: 2023-12-06T21:50:43 UTC
44
# Author: Splunk Threat Research Team - Splunk
55
66
#############

dist/DA-ESS-ContentUpdate/default/content-version.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#############
22
# Automatically generated by generator.py in splunk/security_content
3-
# On Date: 2023-12-06T21:36:36 UTC
3+
# On Date: 2023-12-06T21:50:43 UTC
44
# Author: Splunk Threat Research Team - Splunk
55
66
#############

dist/DA-ESS-ContentUpdate/default/es_investigations.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#############
22
# Automatically generated by generator.py in splunk/security_content
3-
# On Date: 2023-12-06T21:36:36 UTC
3+
# On Date: 2023-12-06T21:50:43 UTC
44
# Author: Splunk Threat Research Team - Splunk
55
66
#############

dist/DA-ESS-ContentUpdate/default/macros.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#############
22
# Automatically generated by generator.py in splunk/security_content
3-
# On Date: 2023-12-06T21:36:36 UTC
3+
# On Date: 2023-12-06T21:50:43 UTC
44
# Author: Splunk Threat Research Team - Splunk
55
66
#############

dist/DA-ESS-ContentUpdate/default/savedsearches.conf

Lines changed: 405 additions & 405 deletions
Large diffs are not rendered by default.

dist/DA-ESS-ContentUpdate/default/transforms.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#############
22
# Automatically generated by generator.py in splunk/security_content
3-
# On Date: 2023-12-06T21:36:36 UTC
3+
# On Date: 2023-12-06T21:50:43 UTC
44
# Author: Splunk Threat Research Team - Splunk
55
66
#############

dist/DA-ESS-ContentUpdate/default/workflow_actions.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#############
22
# Automatically generated by generator.py in splunk/security_content
3-
# On Date: 2023-12-06T21:36:36 UTC
3+
# On Date: 2023-12-06T21:50:43 UTC
44
# Author: Splunk Threat Research Team - Splunk
55
66
#############

0 commit comments

Comments
 (0)