From c927f0620a85a5b43e76d0fdd0a7d276ba9e44aa Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Mon, 14 Apr 2014 09:06:42 +0200 Subject: Update security document with the link to patch document. --- doc/release/patch.md | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/release/patch.md') diff --git a/doc/release/patch.md b/doc/release/patch.md index dc9cce55d98..30bb39b4e49 100644 --- a/doc/release/patch.md +++ b/doc/release/patch.md @@ -12,6 +12,7 @@ Otherwise include it in the monthly release and note there was a regression fix 1. Create an issue on private GitLab development server 1. Name the issue "Release X.X.X CE and X.X.X EE", this will make searching easier 1. Fix the issue on a feature branch, do this on the private GitLab development server +1. Consider creating and testing workarounds 1. After the branch is merged into master, cherry pick the commit(s) into the current stable branch 1. In a separate commit in the stable branch, update the VERSION and CHANGELOG 1. For EE, update the CHANGELOG-EE if it is EE specific fix. Otherwise, merge the stable CE branch and add to CHANGELOG-EE "Merge community edition changes for version X.X.X" -- cgit v1.2.1