Changelog updated

hitachienergy · Nov 24, 2020 · 4b22a13 · 4b22a13
1 parent 4680c72
commit 4b22a13
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/CHANGELOG-0.9.md b/CHANGELOG-0.9.md
@@ -11,6 +11,10 @@
 - [#1835](https://github.com/epiphany-platform/epiphany/issues/1835) - Automated tests may give false negative result for PGAudit
 - [#1409](https://github.com/epiphany-platform/epiphany/issues/1409) - custom_image_registry_address setting is not implemented
 - [#1280](https://github.com/epiphany-platform/epiphany/issues/1280) - [RHEL] Pgpool not showing Replication State
+<<<<<<< HEAD
+=======
+- [#1833](https://github.com/epiphany-platform/epiphany/issues/1833) - DaemonSets of Node Exporter and Filebeat deploy in default namespace
+>>>>>>> 4f1562cc (Changelog updated)
 
 ### Updated