Merge branch 'main' into 1188-ask-the-user-which-sigma-rules-they-wan…

…t-to-enable-by-default-1
Yamato-Security · Oct 18, 2023 · 8a10286 · 8a10286
2 parents 018216c + da093e4
commit 8a10286
Show file tree

Hide file tree

Showing 10 changed files with 283 additions and 294 deletions.
diff --git a/CHANGELOG-Japanese.md b/CHANGELOG-Japanese.md
@@ -1,5 +1,20 @@
 # 変更点
 
+## 2.10.0 [xxxx/xx/xx] "xxx Release"
+
+**改善:**
+
+xxx
+
+**バグ修正:**
+
+- まれにJSONフィールドが正しくパースされない状態を修正した。(#1145) (@hitenkoku)
+- JSON出力で、`AllFieldInfo`は改行文字とタブ文字を除去していたが、出力するように修正した。 (#1189) (@hitenkoku)
+
+**その他:**
+
+xxx
+
 ## 2.9.0 [2023/09/22] "Autumn Rain Release"
 
 **改善:**

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changes
 
+## 2.10.0 [xxxx/xx/xx] "xxx Release"
+
+**Enhancements:**
+
+xxx
+
+**Bug Fixes:**
+
+- Fixed that field information defined in `Details` was also output to `ExtraFieldInfo` in some cases. (#1145) (@hitenkoku)
+- Fixed output of newline and tab characters in `AllFieldInfo` in JSON output. (#1189) (@hitenkoku)
+
+**Other:**
+
+xxx
+
 ## 2.9.0 [2023/09/22] "Autumn Rain Release"
 
 **Enhancements:**