summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2024-10-31 16:31:04 +0100
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2024-12-10 10:15:32 +0000
commit3c836d219b4117b4c9f17878155ff47df1b67173 (patch)
treeef7acab9ce642e90c9714711a0cc984204518413
parentc8d2b806cc20936c4a74e86dad3b60fd69ae825d (diff)
QUIP-16: split the row for update to 3rd party component into two
Instead of a note limiting patches to very strict branches to changes to security critical 3rd party components, add an extra row for clarity. Change-Id: I82abf713fef1206816f36e60d49ce6c9e4478106 Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
-rw-r--r--quip-0016-branch-policy.rst6
1 files changed, 4 insertions, 2 deletions
diff --git a/quip-0016-branch-policy.rst b/quip-0016-branch-policy.rst
index b54ba7f..3f3b875 100644
--- a/quip-0016-branch-policy.rst
+++ b/quip-0016-branch-policy.rst
@@ -186,8 +186,10 @@ regressions.
+----------------------------+--------+--------+-------------+---------+---------------------+
| Security issue | x | x | x | x | |
+----------------------------+--------+--------+-------------+---------+---------------------+
-| 3rd party update | x | x | x | | Very Strict only |
-| | | | | | security/critical |
+| Update 3rd party component | x | x | | | |
++----------------------------+--------+--------+-------------+---------+---------------------+
+| Update security critical | x | x | x | | |
+| 3rd party component | | | | | |
+----------------------------+--------+--------+-------------+---------+---------------------+
| Adapt to minor OS/ | x | x | x | | |
| Compiler updates | | | | | |