diff options
| author | Bipin Kunal <bkunal@redhat.com> | 2015-11-13 19:19:17 +0530 |
|---|---|---|
| committer | Humble Devassy Chirammal <humble.devassy@gmail.com> | 2015-11-15 05:19:37 -0800 |
| commit | 4af4c1acc7b77d70af1b09964c7cbddb5c797214 (patch) | |
| tree | 07fda1a3b4fcbd395e63f25f85058144e0280415 /doc/developer-guide/Backport-Guidelines.md | |
| parent | b7b13c73369a3cb237de16d58425b63640c6f33e (diff) | |
docs: move contributor docs to the glusterdocs repository
* Moved few files to glusterdocs repo
* Files were moved in pull requests given below:
https://github.com/gluster/glusterdocs/pull/60
https://github.com/gluster/glusterdocs/pull/62
* This patch removes file from this repo which were
moved to glusterdocs repo
Change-Id: I6e529911e0be66b261961c44bcdbe361aafa2886
BUG: 1206539
Signed-off-by: Bipin Kunal <bkunal@redhat.com>
Reviewed-on: http://review.gluster.org/12576
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'doc/developer-guide/Backport-Guidelines.md')
| -rw-r--r-- | doc/developer-guide/Backport-Guidelines.md | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/doc/developer-guide/Backport-Guidelines.md b/doc/developer-guide/Backport-Guidelines.md deleted file mode 100644 index af48dc00f03..00000000000 --- a/doc/developer-guide/Backport-Guidelines.md +++ /dev/null @@ -1,41 +0,0 @@ -Bugs often get fixed in master before release branches. When a bug is -fixed in the master branch, it might be desirable or necessary in a -stable branch. To put the fix in stable branch we need to backport the -fix to stable branch. - -Anyone in the community can suggest a backport. If you are interested to -suggest a backport, please check the [Backport -Wishlist](./Backport Wishlist.md). - -This page describes the steps needed to backport simple changes. Changes -that do not apply cleanly will need some manual modifications and using -`git cherry-pick` may not always be the easiest solution. - -1. Git clone the GlusterFS code - - git clone ssh://username@review.gluster.org/glusterfs - -2. Create and checkout a new branch for your work, based on the branch - for the backport version - - git checkout -t -b bug-123456/release-3.5 origin/release-3.5 - -3. Cherry pick the change from master. - - $ git cherry-pick -x a0b1c2d3e4f5 - - verify that the change has been merged in the master branch. - -4. Update/correct the commit message. - - $ git commit -s --amend --date="$(date)" -[This is one example](https://github.com/gluster/glusterfs/commit/40407afb529f6e5fa2f79e9778c2f527122d75eb) of the commit message that has a good description for a backport. Notice the indention of the patch-metadata like BUG, Change-ID and Reviewed-on tags. There is also the original commit-id that was cherry picked from the master branch. - -make sure to quote the review tags - -update the BUG reference, point to the BUG that is used for this -particular release-branch - -add a Signed-off-by tag - -5. Run `./rfc.sh` to post the backport for review. - - ./rfc.sh -After submitting patch(es), make sure to move the bug to the *POST* -status. |