# HG changeset patch
# User Mayra Cabrera <mcabrera@gitlab.com>
# Date 1613157539 21600
#      Fri Feb 12 13:18:59 2021 -0600
# Node ID ba4cf58b7a30ef3091aae43e985dceee361b3c72
# Parent  ef6149f5bbafd59b5d908bf44233710d19fdb02e
Revert "Update CHANGELOG.md for 42.1.1+ee.0"

This reverts commit 6f7d2262c9e645a699dff92ac2d4168bff89ee61.

diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,44 +3,6 @@
 The latest version of this file can be found at the master branch of the
 omnibus-gitlab repository.
 
-## 42.1.1 (2021-02-12)
-
-### Security (1 change)
-
-- Add HTTP header to prevent content sniffing in /assets/* directory.
-
-### Deprecated (1 change)
-
-- Add warning message to migration nodes for PG verisons older than 12. !4918
-
-### Changed (6 changes)
-
-- Update libtiff to 4.2.0. !4859
-- Raise warning if node attribute file can't be found. !4894
-- Update logrotate to 3.18.0. !4902
-- Upgrade Redis to 6.0.10. !4930
-- Bump Container Registry to v3.0.0-gitlab. !4962
-- Add redis config for gitlab-kas. !4974
-
-### Performance (3 changes)
-
-- Bump gitlab-exporter to 10.0.0, use jemalloc allocator. !4922
-- Add Git refs performance patches. !4977
-- Tune Ruby GC for gitlab-exporter. !4987
-
-### Added (4 changes)
-
-- Add application settings cache expiry to gitlab.rb. !4938
-- Emit Ruby Prometheus metrics for gitlab-exporter. !4958
-- Add flag to disable kernel parameter modification. !4967
-- Add matomo_disable_cookies setting. !4979
-
-### Other (2 changes)
-
-- Compile workhorse as part of gitlab-rails. !4829
-- Bump Grafana version to 7.3.7. !4933
-
-
 ## 13.8.4 (2021-02-11)
 
 - No changes.
diff --git a/changelogs/unreleased/5744-gitlab-yml-piwik-disable-cookies.yml b/changelogs/unreleased/5744-gitlab-yml-piwik-disable-cookies.yml
new file mode 100644
--- /dev/null
+++ b/changelogs/unreleased/5744-gitlab-yml-piwik-disable-cookies.yml
@@ -0,0 +1,5 @@
+---
+title: Add matomo_disable_cookies setting
+merge_request: 4979
+author:
+type: added
diff --git a/changelogs/unreleased/add-application-settings-cache-support.yml b/changelogs/unreleased/add-application-settings-cache-support.yml
new file mode 100644
--- /dev/null
+++ b/changelogs/unreleased/add-application-settings-cache-support.yml
@@ -0,0 +1,5 @@
+---
+title: Add application settings cache expiry to gitlab.rb
+merge_request: 4938
+author:
+type: added
diff --git a/changelogs/unreleased/add-redis-config-for-kas.yml b/changelogs/unreleased/add-redis-config-for-kas.yml
new file mode 100644
--- /dev/null
+++ b/changelogs/unreleased/add-redis-config-for-kas.yml
@@ -0,0 +1,5 @@
+---
+title: 'Add redis config for gitlab-kas'
+merge_request: 4974
+author:
+type: changed
diff --git a/changelogs/unreleased/bump-registry-version-v3-0-0-gitlab.yml b/changelogs/unreleased/bump-registry-version-v3-0-0-gitlab.yml
new file mode 100644
--- /dev/null
+++ b/changelogs/unreleased/bump-registry-version-v3-0-0-gitlab.yml
@@ -0,0 +1,4 @@
+title: Bump Container Registry to v3.0.0-gitlab
+merge_request: 4962
+author:
+type: changed
diff --git a/changelogs/unreleased/check-remote-pg-version.yml b/changelogs/unreleased/check-remote-pg-version.yml
new file mode 100644
--- /dev/null
+++ b/changelogs/unreleased/check-remote-pg-version.yml
@@ -0,0 +1,5 @@
+---
+title: Add warning message to migration nodes for PG verisons older than 12
+merge_request: 4918
+author:
+type: deprecated
diff --git a/changelogs/unreleased/cpaulik-master-patch-44479.yml b/changelogs/unreleased/cpaulik-master-patch-44479.yml
new file mode 100644
--- /dev/null
+++ b/changelogs/unreleased/cpaulik-master-patch-44479.yml
@@ -0,0 +1,6 @@
+---
+title: Update node.rules to only alert if filesystem has less than 5% and less than
+  10GB available
+merge_request: !4923
+author: @cpaulik
+type: changed
diff --git a/changelogs/unreleased/dcouture-master-patch-54390.yml b/changelogs/unreleased/dcouture-master-patch-54390.yml
new file mode 100644
--- /dev/null
+++ b/changelogs/unreleased/dcouture-master-patch-54390.yml
@@ -0,0 +1,5 @@
+---
+title: Add HTTP header to prevent content sniffing in /assets/* directory
+merge_request:
+author:
+type: security
diff --git a/changelogs/unreleased/deps-1f64255-9af8ae0.yml b/changelogs/unreleased/deps-1f64255-9af8ae0.yml
new file mode 100644
--- /dev/null
+++ b/changelogs/unreleased/deps-1f64255-9af8ae0.yml
@@ -0,0 +1,5 @@
+---
+title: Bump Grafana version to 7.3.7
+merge_request: 4933
+author:
+type: other
diff --git a/changelogs/unreleased/deps-ac5e309-8115fbb.yml b/changelogs/unreleased/deps-ac5e309-8115fbb.yml
new file mode 100644
--- /dev/null
+++ b/changelogs/unreleased/deps-ac5e309-8115fbb.yml
@@ -0,0 +1,5 @@
+---
+title: Update libtiff to 4.2.0
+merge_request: 4859
+author:
+type: changed
diff --git a/changelogs/unreleased/deps-daa24eb-8910021.yml b/changelogs/unreleased/deps-daa24eb-8910021.yml
new file mode 100644
--- /dev/null
+++ b/changelogs/unreleased/deps-daa24eb-8910021.yml
@@ -0,0 +1,5 @@
+---
+title: Update logrotate to 3.18.0
+merge_request: 4902
+author:
+type: changed
diff --git a/changelogs/unreleased/fix-node-attribute-file-missing.yml b/changelogs/unreleased/fix-node-attribute-file-missing.yml
new file mode 100644
--- /dev/null
+++ b/changelogs/unreleased/fix-node-attribute-file-missing.yml
@@ -0,0 +1,5 @@
+---
+title: Raise warning if node attribute file can't be found
+merge_request: 4894
+author:
+type: changed
diff --git a/changelogs/unreleased/jv-git-patches.yml b/changelogs/unreleased/jv-git-patches.yml
new file mode 100644
--- /dev/null
+++ b/changelogs/unreleased/jv-git-patches.yml
@@ -0,0 +1,5 @@
+---
+title: Add Git refs performance patches
+merge_request: 4977
+author:
+type: performance
diff --git a/changelogs/unreleased/jv-workhorse-source.yml b/changelogs/unreleased/jv-workhorse-source.yml
new file mode 100644
--- /dev/null
+++ b/changelogs/unreleased/jv-workhorse-source.yml
@@ -0,0 +1,5 @@
+---
+title: Compile workhorse as part of gitlab-rails
+merge_request: 4829
+author:
+type: other
diff --git a/changelogs/unreleased/mk-gitlab-exporter-gc-settings.yml b/changelogs/unreleased/mk-gitlab-exporter-gc-settings.yml
new file mode 100644
--- /dev/null
+++ b/changelogs/unreleased/mk-gitlab-exporter-gc-settings.yml
@@ -0,0 +1,5 @@
+---
+title: Tune Ruby GC for gitlab-exporter
+merge_request: 4987
+author:
+type: performance
diff --git a/changelogs/unreleased/mk-gitlab-exporter-ruby-probe.yml b/changelogs/unreleased/mk-gitlab-exporter-ruby-probe.yml
new file mode 100644
--- /dev/null
+++ b/changelogs/unreleased/mk-gitlab-exporter-ruby-probe.yml
@@ -0,0 +1,5 @@
+---
+title: Emit Ruby Prometheus metrics for gitlab-exporter
+merge_request: 4958
+author:
+type: added
diff --git a/changelogs/unreleased/mk-gl-exporter-jemalloc.yml b/changelogs/unreleased/mk-gl-exporter-jemalloc.yml
new file mode 100644
--- /dev/null
+++ b/changelogs/unreleased/mk-gl-exporter-jemalloc.yml
@@ -0,0 +1,5 @@
+---
+title: Bump gitlab-exporter to 10.0.0, use jemalloc allocator
+merge_request: 4922
+author:
+type: performance
diff --git a/changelogs/unreleased/redis-6-0-10.yml b/changelogs/unreleased/redis-6-0-10.yml
new file mode 100644
--- /dev/null
+++ b/changelogs/unreleased/redis-6-0-10.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade Redis to 6.0.10
+merge_request: 4930
+author:
+type: changed
diff --git a/changelogs/unreleased/setting-to-control-kernel-params.yml b/changelogs/unreleased/setting-to-control-kernel-params.yml
new file mode 100644
--- /dev/null
+++ b/changelogs/unreleased/setting-to-control-kernel-params.yml
@@ -0,0 +1,5 @@
+---
+title: Add flag to disable kernel parameter modification
+merge_request: 4967
+author:
+type: added