From d85f0d3d05ab46b7001c4fafafbc8cbc0fd3934d Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Wed, 4 Sep 2019 17:22:33 +0200 Subject: The source of truth for the supported branches is the docs portal. A cherry-pick of: 948c3ea4e9a7e79d1de4a09e452fbdbbd5772073 f2dcc347e576dc30ca1ac750a1c9d341a3d41dd5 (partial) e307742ffd9a255f6e029c93a14c506409508a4b Signed-off-by: Patrick Vacek --- CONTRIBUTING.adoc | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 0b40438..2db33c5 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -1,15 +1,7 @@ = Contributing +:aktualizr-docsroot: https://github.com/advancedtelematic/aktualizr/tree/master/docs/ota-client-guide/modules/ROOT/pages/ -We welcome pull requests from anyone. The master branch is the primary branch for development, and if you wish to add new functionality, it probably belongs there. We attempt to maintain recent previous branches and welcome bug fixes and backports for those. Currently, the actively maintained branches are: - -* thud -* sumo -* rocko - -Previously, some older branches were also regularly supported, and while they should still be stable, they have not been updated or actively maintained for a while. These branches include: - -* pyro -* morty +We welcome pull requests from anyone. The master branch is the primary branch for development, and if you wish to add new functionality, it probably belongs there. We attempt to maintain recent release branches and welcome bug fixes and backports for those. Please see the xref:{aktualizr-docsroot}yocto-release-branches.adoc[release branches] documentation for the current list of supported branches. If you are developing with meta-updater, it may be helpful to read the README and other documentation for link:README.adoc[this repo], https://github.com/advancedtelematic/aktualizr[aktualizr], and the https://github.com/advancedtelematic/updater-repo/[updater-repo], particularly the sections about development and debugging. -- cgit v1.2.3-54-g00ecf