[Pkg-owncloud-commits] [owncloud-doc] 107/110: first draft, to be pretified and storified :D

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud-doc.

commit c76dac002902f5c1d1ae6204c88c9bf0237f7f33
Author: Jos Poortvliet <jospoortvliet at gmail.com>
Date:   Fri Dec 12 13:31:05 2014 +0100

    first draft, to be pretified and storified :D
    
    prettified and storified. Needs review, also for style, and integration in the navigation.
    
    add table of content entry and add note about backport freezes
    
    feedback nickvergessen
    
    update backport process
---
 developer_manual/general/backporting.rst | 23 +++++++++++++++++++++++
 developer_manual/general/index.rst       |  1 +
 2 files changed, 24 insertions(+)

diff --git a/developer_manual/general/backporting.rst b/developer_manual/general/backporting.rst
new file mode 100644
index 0000000..27e5142
--- /dev/null
+++ b/developer_manual/general/backporting.rst
@@ -0,0 +1,23 @@
+Backporting
+===========
+
+.. sectionauthor:: Morris Jobke, Jos Poortvliet
+
+General
+-------
+
+We backport important fixes and improvements from the current master release to get them to our users faster.
+
+Process
+-------
+
+We mostly consider bug fixes for back porting. Occasionally, important changes to the API can be backported to make it easier for developers to keep their apps working between major releases. If you think a pull request (PR) is relevant for the stable release, go through these steps:
+
+1. Make sure the PR is merged to master
+2. Ask Frank (**@karlitschek**) and Thomas (**@deepdiver1975**) if the code should be backported and add the label `backport-request <https://github.com/owncloud/core/labels/Backport-Request>`_ to the PR
+3. If Frank or Thomas say yes then create a new branch based on the respective stable branch (stable7 for the 7.0.x series), cherry-pick the needed commits to that branch and create a PR on GitHub.
+4. Specify the corresponding milestone for that series (7.0.x-next-maintenance for the 7.0.x series) to this PR and reference the original PR in there. This enables the QA team to find the backported items for testing and having the original PR with detailed description linked.
+
+.. note:: Before each patch release there is a freeze to be able to test everything as a whole without pulling in new changes. This freeze is announced on the `owncloud-devel mailinglist <https://mailman.owncloud.org/pipermail/devel/>`_. While this freeze is active a backport isn't allowed and has to wait for the next patch release.
+
+The QA team will try to reproduce all the issues with the X.Y.Z-next-maintenance milestone on the relevant release and verify it is fixed by the patch release (and doesn't cause new problems). Once the patch release is out, the post-fix -next-maintenance is removed and a new -next-maintenance milestone is created for that series.
diff --git a/developer_manual/general/index.rst b/developer_manual/general/index.rst
index f7cc212..a3573c5 100644
--- a/developer_manual/general/index.rst
+++ b/developer_manual/general/index.rst
@@ -11,3 +11,4 @@ General Contributor Guidelines
    codingguidelines
    performance
    debugging
+   backporting

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git