projects / ceph.git / blame
| Commit | Line | Data |
|---|---|---|
| 7c673cae FG |
1 | Notes on Ceph repositories |
| 2 | ========================== | |
| 3 | ||
| 4 | Special branches | |
| 5 | ---------------- | |
| 6 | ||
| 7 | * ``master``: current tip (integration branch) | |
| 11fdf7f2 TL |
8 | * Release branches (for example ``luminous``) corresponding to the releases |
| 9 | listed at :ref:`ceph-releases` | |
| 7c673cae FG |
10 | |
| 11 | Rules | |
| 12 | ----- | |
| 13 | ||
| 14 | The source repos are all on github. | |
| 15 | ||
| 11fdf7f2 TL |
16 | * Any branch pushed to ceph-ci.git will kick off builds that will |
| 17 | generate packages and repositories on shaman.ceph.com. Try | |
| 7c673cae FG |
18 | not to generate unnecessary load. For private, unreviewed work, |
| 19 | only push to branches named ``wip-*``. This avoids colliding with | |
| 20 | any special branches. | |
| 21 | ||
| 11fdf7f2 | 22 | * Nothing should reach a special branch unless it has been |
| 7c673cae FG |
23 | reviewed. |
| 24 | ||
| 25 | * Preferred means of review is via github pull requests to capture any | |
| 26 | review discussion. | |
| 27 | ||
| 28 | * For multi-patch series, the pull request can be merged via github, | |
| 29 | and a Reviewed-by: ... line added to the merge commit. | |
| 30 | ||
| 31 | * For single- (or few-) patch merges, it is preferable to add the | |
| 32 | Reviewed-by: directly to the commit so that it is also visible when | |
| 33 | the patch is cherry-picked for backports. | |
| 34 | ||
| 35 | * All backports should use ``git cherry-pick -x`` to capture which | |
| 36 | commit they are cherry-picking from. |