From 84f480c5a85a595f15e1d3ab3f9ee7e37aed16cf Mon Sep 17 00:00:00 2001
From: Colin Adler <colin@coder.com>
Date: Thu, 17 Mar 2022 17:51:35 -0500
Subject: [PATCH] chore: add 1.26.4 changelog

---
 changelog/1.26.4.md | 20 ++++++++++++++++++++
 manifest.json       |  3 +++
 2 files changed, 23 insertions(+)
 create mode 100644 changelog/1.26.4.md

diff --git a/changelog/1.26.4.md b/changelog/1.26.4.md
new file mode 100644
index 000000000..71be6444b
--- /dev/null
+++ b/changelog/1.26.4.md
@@ -0,0 +1,20 @@
+---
+title: "1.26.4"
+description: "Released on 03/17/2022"
+---
+
+### Breaking changes ❗
+
+There are no breaking changes in 1.26.4.
+
+### Features ✨
+
+There are no security updates in 1.26.4.
+
+### Bug fixes 🐛
+
+- infra: ensure CVM daemons aren't oom-killed.
+
+### Security updates 🔐
+
+There are no security updates in 1.26.4.
diff --git a/manifest.json b/manifest.json
index 5189cada3..de92e5885 100644
--- a/manifest.json
+++ b/manifest.json
@@ -568,6 +568,9 @@
         {
           "path": "./changelog/1.26.0.md",
           "children": [
+            {
+              "path": "./changelog/1.26.4.md"
+            },
             {
               "path": "./changelog/1.26.3.md"
             },