From 7753f56a6435431ad490a0de615f984de35c4133 Mon Sep 17 00:00:00 2001 From: "Marc A. Paradise" Date: Sat, 20 Apr 2019 12:33:12 -0400 Subject: Triggering expeditor version bump Signed-off-by: Marc A. Paradise --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b7b820fc4..ce5e490487 100644 --- a/README.md +++ b/README.md @@ -169,7 +169,7 @@ Submit a PR with the changes made by the above. ## Branch Structure -We develop and ship the current release of Chef off the master branch of this repository. Our goal is that master should always be in a shipable state. Previous stable releases of Chef are developed on their own branches named by the major version (ex: chef-13 or chef-12). We do not perform direct development on these stable branches except to resolve build failures. Instead we backport fixes from our master branch to these stable branches. Stable branches receive critical bugfixes and security releases and stable Chef releases are made as necessary for security purposes. +We develop and ship the current release of Chef off the master branch of this repository. Our goal is that master should always be in a shipable state. Previous stable releases of Chef are developed on their own branches named by the major version (ex: chef-13 or chef-12). We do not perform direct development on these stable branches except to resolve build failures. Instead we backport fixes from our master branch to these stable branches. Stable branches receive critical bugfixes and security releases and stable Chef releases are made as necessary for security purposes. ## Backporting Fixes to Stable Releases -- cgit v1.2.1