From bb2b1f58aa8f468f811212264c4e109a0aec0a42 Mon Sep 17 00:00:00 2001 From: mikeller Date: Sat, 21 Jul 2018 18:44:32 +1200 Subject: [PATCH] Added release freeze announcement for 3.5 to pull request template, removed F1 end of life message. --- .github/pull_request_template.md | 11 +++++++++++ README.md | 3 --- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 23f834563..5b1aff09d 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,3 +1,14 @@ +## Important: Feature freeze / release candidate phase for Betaflight 3.5 + +From 22/07/2018 until the release of Betaflight 3.5.0 (scheduled for 05/08/2018), the project is in a 'feature freeze / release candidate' phase. This means: + +1. Pull requests can still be submitted as normal. Comments / discussions will probably be slower than normal due to shifted priorities; + +2. If your pull request is a fix for an existing bug, or an update for a single target that has a low risk of side effect for other targets, it will be reviewed, and if accepted merged into `master` for the 3.5 release; + +3. All other pull requests will be scheduled for 4.0, and discussed / reviewed / merged into `master` after 3.5.0 has been released. Please keep in mind that this potentially means that you will have to rebase your changes if they are broken by bugfixes made for 3.5. + + ## Important considerations when opening a pull request: 1. Pull requests will only be accepted if they are opened against the `master` branch. Pull requests opened against other branches without prior consent from the maintainers will be closed; diff --git a/README.md b/README.md index 8681eb7e6..71a8f5ee5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,3 @@ -![Important Notice: Support for STM32F1 based flight controllers has been dropped in Betaflight release 3.3. This includes NAZE, CC3D (original) and CJMCU like flight controllers](https://raw.githubusercontent.com/wiki/betaflight/betaflight/images/betaflight/stm32f1_support_notice.png) - - ![Betaflight](https://raw.githubusercontent.com/wiki/betaflight/betaflight/images/betaflight/bf_logo.png) Betaflight is flight controller software (firmware) used to fly multi-rotor craft and fixed wing craft. -- 2.11.4.GIT