Merge pull request #4694 from sensu/rename-changelog

Rename CHANGELOG.md -> CHANGELOG-6.md
sensu · Apr 13, 2022 · 37f1bf7 · 37f1bf7
2 parents 1e946ac + ce39884
commit 37f1bf7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1 @@
-CHANGELOG.md merge=union
+CHANGELOG-6.md merge=union
diff --git a/CHANGELOG.md → CHANGELOG-6.md b/CHANGELOG.md → CHANGELOG-6.md
diff --git 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.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		CHANGELOG.md merge=union
		CHANGELOG-6.md merge=union