diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2018-11-14 09:48:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-14 09:48:27 +0100 |
| commit | 244e716f3df772e85cfe927c144b932d281afcbc (patch) | |
| tree | 59d9d3ef7cffb53bc9f87f16204b17f107e1b45f /CONTRIBUTING.adoc | |
| parent | aad99c3f0c2a6d4ce0252946112022a271c8c76d (diff) | |
| parent | ed85c34d6518f5442a9b859c8cffb5cb69047ebd (diff) | |
| download | meta-updater-244e716f3df772e85cfe927c144b932d281afcbc.tar.gz | |
Merge pull request #428 from advancedtelematic/fix/sumo/newline-etc
Fix/sumo/newline etc
Diffstat (limited to 'CONTRIBUTING.adoc')
| -rw-r--r-- | CONTRIBUTING.adoc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 3d0f14d..f12b95d 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc | |||
| @@ -1,6 +1,15 @@ | |||
| 1 | = Contributing | 1 | = Contributing |
| 2 | 2 | ||
| 3 | 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 sumo, rocko, and pyro. Previously, morty was also a stable branch, but it has not been updated or actively maintained for a while. | 3 | 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: |
| 4 | |||
| 5 | * thud | ||
| 6 | * sumo | ||
| 7 | * rocko | ||
| 8 | |||
| 9 | 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: | ||
| 10 | |||
| 11 | * pyro | ||
| 12 | * morty | ||
| 4 | 13 | ||
| 5 | 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. | 14 | 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. |
| 6 | 15 | ||