resolve conflicts

opentelekomcloud-infra · Sep 18, 2024 · 1021ee8 · 1021ee8
1 parent 6b6084d
commit 1021ee8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@ __pycache__/
 *.pyd
 *.swp
 *.swo
+config/
+scripts/
diff --git a/scripts/eod_9_scheduler.py b/scripts/eod_9_scheduler.py
@@ -23,6 +23,8 @@
     "Database Squad": {"stream": "Database Squad", "topic": "Doc alerts"},
     "Big Data and AI Squad": {"stream": "bigdata & ai", "topic": "helpcenter_alerts"},
     "Compute Squad": {"stream": "compute", "topic": "hc_alerts topic"},
+    "Storage Squad": {"stream": "Storage Squad", "topic": "helpcenter_alerts"},
+    "Container squad": {"stream": "Container squad", "topic": "Doc alerts"},
     "Network Squad": {"stream": "network", "topic": "Alerts_HelpCenter"}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,5 @@ __pycache__/ @@
     *.pyd
     *.swp
     *.swo
+    config/
+    scripts/