You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2015/10/26 10:08:19 UTC
[33/45] incubator-kylin git commit: minor, update how to contribute
minor, update how to contribute
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/22917f53
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/22917f53
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/22917f53
Branch: refs/heads/master
Commit: 22917f53b5766d187b62d4ba03379f4936f9237f
Parents: 1c1a24c
Author: Yang Li <li...@apache.org>
Authored: Wed Oct 7 21:54:08 2015 +0800
Committer: Yang Li <li...@apache.org>
Committed: Wed Oct 7 21:54:08 2015 +0800
----------------------------------------------------------------------
website/_dev/howto_contribute.md | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/22917f53/website/_dev/howto_contribute.md
----------------------------------------------------------------------
diff --git a/website/_dev/howto_contribute.md b/website/_dev/howto_contribute.md
index 5e55438..6e87c0c 100644
--- a/website/_dev/howto_contribute.md
+++ b/website/_dev/howto_contribute.md
@@ -9,21 +9,20 @@ permalink: /development/howto_contribute.html
Here are the major branches:
-* 0.7-staging: dev branch for 0.7 versions, this branch spawns releases like 0.7.1, 0.7.2, the next release would be 0.7.3.
-* 0.8: dev branch for 0.8 versions, 0.8 is like the next generation Kylin (with streaming, spark support), it has fundamental difference with 0.7 version, which means any changes on 0.7 will not be merged to 0.8 anymore. So if your patch affects both of the branch, you should make patches for both branch.
-* master: always point to the latest stable release(stable, but not up to date)
+* `1.x-staging`: Dev branch for 1,x versions, this branch spawns releases like 1.0, 1.1 etc. This is where new patches go to.
+* `2.x-staging`: Dev branch for 2.x versions, 2.x is the next generation Kylin (with streaming, spark support), it has fundamental difference with 1.x version, which means any changes on 1.x cannot merge to 2.x anymore. So if your patch affects both branches, you should make patches for both branches.
+* `master`: always point to the latest stable release (stable, but not up to date)
## Making Changes
* Raise an issue on JIRA, describe the feature/enhancement/bug
* Discuss with others in mailing list or issue comments, make sure the proposed changes fit in with what others are doing and have planned for the project
* Make changes in your fork
* Write unit test if no existing cover your change
-* Generate patch and attach it to relative JIRA; Please use "git format-patch" command to generate the patch, for a detail guide you can refer to [How to create and apply a patch with Git](https://ariejan.net/2009/10/26/how-to-create-and-apply-a-patch-with-git/)
+* Generate patch and attach it to relative JIRA; Please use `git format-patch` command to generate the patch, for a detail guide you can refer to [How to create and apply a patch with Git](https://ariejan.net/2009/10/26/how-to-create-and-apply-a-patch-with-git/)
## Apply Patch
* Committer will review in terms of correctness, performance, design, coding style, test coverage
* Discuss and revise if necessary
-* Finally committer merge code into main branch
-
+* Finally committer merge code into target branch