aboutsummaryrefslogtreecommitdiffstats
path: root/docs/breaking_changes.md
diff options
context:
space:
mode:
authorJames Young <xxiinophobia@yahoo.com>2020-01-04 12:24:51 -0800
committerJames Young <xxiinophobia@yahoo.com>2020-01-04 12:24:51 -0800
commitc1feeaa57f28c781e39996e5d4eea3a31f083439 (patch)
treeca9fc68643659661d5f82dd0325c0067090c4fd5 /docs/breaking_changes.md
parent6e520a721dc093244473bb786a1058d655f75406 (diff)
downloadfirmware-c1feeaa57f28c781e39996e5d4eea3a31f083439.tar.gz
firmware-c1feeaa57f28c781e39996e5d4eea3a31f083439.tar.bz2
firmware-c1feeaa57f28c781e39996e5d4eea3a31f083439.zip
Update Breaking Changes doc for 2020-02-29 merge
Diffstat (limited to 'docs/breaking_changes.md')
-rw-r--r--docs/breaking_changes.md14
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
index b5bcb7a1c..fc71cf5ab 100644
--- a/docs/breaking_changes.md
+++ b/docs/breaking_changes.md
@@ -10,16 +10,16 @@ The breaking change period is when we will merge PR's that change QMK in dangero
## When is the next Breaking Change?
-The next Breaking Change is scheduled for Nov 29.
+The next Breaking Change is scheduled for February 29, 2020.
### Important Dates
* [x] 2019 Sep 21 - `future` is created. It will be rebased weekly.
-* [ ] 2019 Nov 01 - `future` closed to new PR's.
-* [ ] 2019 Nov 01 - Call for testers.
-* [ ] 2019 Nov 27 - `master` is locked, no PR's merged.
-* [ ] 2019 Nov 29 - Merge `future` to `master`.
-* [ ] 2019 Nov 30 - `master` is unlocked. PR's can be merged again.
+* [ ] 2020 Jan 11 - `future` closed to new PR's.
+* [ ] 2020 Jan 11 - Call for testers.
+* [ ] 2020 Feb 26 - `master` is locked, no PR's merged.
+* [ ] 2020 Feb 28 - Merge `future` to `master`.
+* [ ] 2020 Feb 29 - `master` is unlocked. PR's can be merged again.
## What changes will be included?
@@ -68,7 +68,7 @@ This happens immediately after the previous `future` branch is merged.
* [ ] `git push origin future`
* [ ] `git push --tags`
-## 4 Weeks Before Merge
+## 4+ Weeks Before Merge
* `future` is now closed to new PR's, only fixes for current PR's may be merged
* Post call for testers