summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2018-06-12 10:05:00 +0200
committerPatrick Vacek <patrickvacek@gmail.com>2018-06-12 10:23:29 +0200
commite0ccde55fbc92ba10ab273fd8a01aac1d49339df (patch)
treec68f7c2590f45df3dd04dcfa115a135b10415cb6
parent8cf40b82f9e7eb6850290700f9f011d77f3a99c8 (diff)
downloadmeta-updater-e0ccde55fbc92ba10ab273fd8a01aac1d49339df.tar.gz
CONTRIBUTING.adoc: clarify which branches have what status.
-rw-r--r--CONTRIBUTING.adoc3
1 files changed, 2 insertions, 1 deletions
diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
index df7a717..93a0815 100644
--- a/CONTRIBUTING.adoc
+++ b/CONTRIBUTING.adoc
@@ -1,4 +1,5 @@
1= Contributing 1= Contributing
2 2
3We welcome pull requests from everyone. 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 and development and debugging. 3We 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.
4 4
5If 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.