Adding upstream version 14.2.21.upstream/14.2.21upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 36 insertions, 0 deletions

diff --git a/doc/dev/repo-access.rst b/doc/dev/repo-access.rst
new file mode 100644
index 00000000..8cc17610
--- /dev/null
+++ b/doc/dev/repo-access.rst
@@ -0,0 +1,36 @@
+Notes on Ceph repositories
+==========================
+
+Special branches
+----------------
+
+* ``master``: current tip (integration branch)
+* Release branches (for example ``luminous``) corresponding to the releases
+  listed at :ref:`ceph-releases`
+
+Rules
+-----
+
+The source repos are all on github.
+
+* Any branch pushed to ceph-ci.git will kick off builds that will
+  generate packages and repositories on shaman.ceph.com. Try
+  not to generate unnecessary load.  For private, unreviewed work,
+  only push to branches named ``wip-*``.  This avoids colliding with
+  any special branches.
+
+* Nothing should reach a special branch unless it has been
+  reviewed.
+
+* Preferred means of review is via github pull requests to capture any
+  review discussion.
+
+* For multi-patch series, the pull request can be merged via github,
+  and a Reviewed-by: ... line added to the merge commit.
+
+* For single- (or few-) patch merges, it is preferable to add the
+  Reviewed-by: directly to the commit so that it is also visible when
+  the patch is cherry-picked for backports.
+
+* All backports should use ``git cherry-pick -x`` to capture which
+  commit they are cherry-picking from.