Repository: kylin Updated Branches: refs/heads/document 20c7e3069 -> 5ca4c39bf
branch info update Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/5ca4c39b Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/5ca4c39b Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/5ca4c39b Branch: refs/heads/document Commit: 5ca4c39bf2915f5982c620ea76da9fecf317bb56 Parents: 20c7e30 Author: Li Yang <[email protected]> Authored: Thu Mar 10 17:11:06 2016 +0800 Committer: Li Yang <[email protected]> Committed: Thu Mar 10 17:11:06 2016 +0800 ---------------------------------------------------------------------- website/_dev/howto_contribute.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/5ca4c39b/website/_dev/howto_contribute.md ---------------------------------------------------------------------- diff --git a/website/_dev/howto_contribute.md b/website/_dev/howto_contribute.md index c5d0e29..b865dd3 100644 --- a/website/_dev/howto_contribute.md +++ b/website/_dev/howto_contribute.md @@ -6,9 +6,9 @@ permalink: /development/howto_contribute.html --- ## Current branches -* `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) +* `master`: Main development branch for new features +* `1.3.x`: Maintenance branch for a certain release +* `document`: Document branch ## Making Changes * [Setup dev env](/development/dev_env.html)
