diff options
| author | Gilles Peskine <Gilles.Peskine@arm.com> | 2021-03-16 12:05:16 +0100 |
|---|---|---|
| committer | Gilles Peskine <Gilles.Peskine@arm.com> | 2021-03-16 12:05:16 +0100 |
| commit | 991bbe7f5e1cf13c321e3a615714ad9c4df4cd09 (patch) | |
| tree | c76419c434895efe2724e70f01ad040c2d3c4e88 /BRANCHES.md | |
| parent | a23df13e52aa13afae947fad6cc2be1470d1f41c (diff) | |
| download | mbedtls-991bbe7f5e1cf13c321e3a615714ad9c4df4cd09.zip mbedtls-991bbe7f5e1cf13c321e3a615714ad9c4df4cd09.tar.gz mbedtls-991bbe7f5e1cf13c321e3a615714ad9c4df4cd09.tar.bz2 | |
Mention the master branch as well
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
Diffstat (limited to 'BRANCHES.md')
| -rw-r--r-- | BRANCHES.md | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/BRANCHES.md b/BRANCHES.md index ebb95b7..a7f9076 100644 --- a/BRANCHES.md +++ b/BRANCHES.md @@ -2,6 +2,9 @@ At any point in time, we have a number of maintained branches consisting of: +- The [`master`](https://github.com/ARMmbed/mbedtls/tree/master) branch: + this always contains the latest release, including all publicly available + security fixes. - The [`development`](https://github.com/ARMmbed/mbedtls/tree/development) branch: this is where new features land, as well as bug fixes and security fixes. @@ -9,7 +12,7 @@ At any point in time, we have a number of maintained branches consisting of: these only get bug fixes and security fixes. We use [Semantic Versioning](https://semver.org/). In particular, we maintain -API compatibility in the development branch between major version changes. We +API compatibility in the `master` branch between major version changes. We also maintain ABI compatibility within LTS branches; see the next section for details. @@ -43,6 +46,7 @@ CONTRIBUTING](CONTRIBUTING.md#cackwords-compatibility). The following branches are currently maintained: +- [master](https://github.com/ARMmbed/mbedtls/tree/master) - [`development`](https://github.com/ARMmbed/mbedtls/) - [`mbedtls-2.16`](https://github.com/ARMmbed/mbedtls/tree/mbedtls-2.16) maintained until at least the end of 2021, see |