summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc A. Paradise <marc.paradise@gmail.com>2019-04-20 12:33:12 -0400
committerMarc A. Paradise <marc.paradise@gmail.com>2019-04-20 12:33:12 -0400
commit7753f56a6435431ad490a0de615f984de35c4133 (patch)
tree070b3ba80000e93d824ff9fd06b64f5a552adc01
parentc9d17cbe1a38ea940b8d38c660b175f4a7cf3335 (diff)
downloadchef-7753f56a6435431ad490a0de615f984de35c4133.tar.gz
Triggering expeditor version bump
Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
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