From 5ddac4361841d0163a1ddcc148d3ca263c7ba5db Mon Sep 17 00:00:00 2001 From: Justin Kolberg Date: Wed, 13 Apr 2022 12:04:46 -0700 Subject: [PATCH 1/2] rename CHANGELOG.md -> CHANGELOG-6.md Signed-off-by: Justin Kolberg --- CHANGELOG.md => CHANGELOG-6.md | 0 CONTRIBUTING.md | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename CHANGELOG.md => CHANGELOG-6.md (100%) diff --git a/CHANGELOG.md b/CHANGELOG-6.md similarity index 100% rename from CHANGELOG.md rename to CHANGELOG-6.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ce726f995b..8cc00237df 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ branch to base your changes on, and so on. 1. Open an issue to describe your proposed improvement or feature 1. [Install Go and fork the Sensu Go repository](https://github.com/sensu/sensu-go#building-from-source) 1. Create your feature branch (`git checkout -b my-new-feature`) -1. If applicable, add a [CHANGELOG.md entry](#changelog) describing your change. +1. If applicable, add a [CHANGELOG-6.md entry](#changelog) describing your change. 1. Commit your changes with a [DCO Signed-off-by statement](#dco) (`git commit --signoff`) 1. Push your feature branch (`git push origin my-new-feature`) 1. Create a Pull Request as appropriate based on the issue discussion @@ -95,7 +95,7 @@ after this with `git push -f`. -- Thanks Chef! ## Changelog -The Sensu [Changelog](CHANGELOG.md) is based on the Sensu Community +The Sensu [Changelog](CHANGELOG-6.md) is based on the Sensu Community [Changelog guidelines](https://github.com/sensu-plugins/community/blob/master/HOW_WE_CHANGELOG.md). All new changes go underneath the _Unreleased_ heading at the top of the Changelog. From ce39884c8b2526fd113996bc94c6e07509db64a5 Mon Sep 17 00:00:00 2001 From: Justin Kolberg Date: Wed, 13 Apr 2022 12:06:58 -0700 Subject: [PATCH 2/2] rename CHANGELOG.md in .gitattributes Signed-off-by: Justin Kolberg --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index a19ade077d..60c4d47cd6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -CHANGELOG.md merge=union +CHANGELOG-6.md merge=union