Hi Houliang, Thanks for raising this up.
1. You'd better to start a new thread entitled "[VOTE][RESULT] ....." for the vote. 2. start another thread to discuss about the cluster version management. Best, ----------------------------------- Xiangdong Huang School of Software, Tsinghua University 黄向东 清华大学 软件学院 Houliang Qi <[email protected]> 于2020年10月12日周一 上午11:57写道： > Hi all, > As the vote have passed more than 72 hours, the vote results are as > following > > > [D] Develop +7 > [M] Main +1 > [K] Keep master 0 > > > And I’d like to start a new discussion about this: > > > As someone mentioned that there should be a develop branch and a release > branch. The develop branch is used to submit the latest development, and > the release branch is used for the functions that need to be released in > the latest release. > > > At the same time, I hope that the development of cluster can also have two > branches: cluster_develop branch and cluster_release branch. > > > The cluster_develop branch is used to merge the stand-alone version of the > develop branch code and the latest development of the cluster. > > > The cluster_release branch is used to release some of the latest features. > Only the functions that need to be released are allowed to be merged into > the cluster_release branch, or to fix some bugs. Other newly developed > functions are not allowed to be merged into the cluster_release branch. > After cluster_release has been fully tested, it can be released. > > > Regarding the latest release, I would like to check out a cluster_release > branch after the cluster_premerge branch merges into the master (develop), > and then the master branch merges into the cluster_new (cluster_develop) > branch. > > > And I think the new functions do not have beed tested or need more than > one month to tested should be switch off when release the cluster version. > > > Does anyone have some ideas about this? > > > Thanks, > --------------------------------------- > Houliang Qi > On 09/24/2020 02:38，Kevin A. McGrail<[email protected]> wrote： > I am +1 to rename it but don't have any good input on what would be a > good name to use going forward. I'll defer to others on that. > > On 9/22/2020 4:23 AM, Xiangdong Huang wrote: > Hi, > > There is a movement to move the default branch from "master" to "main" or > "develop", because of two reasons: > > - Many people around the world thought the word "master" has some .... > other meaning. > - the word "master" can not clearly describe the branch's purpose. As we > use the branch as our main working/developing branch, "main" or "develop" > may be better. > > We had a discussion on private@ and I think it is time to start a vote in > public. > > So, I'd like to call a formal vote for changing the default branch: > > - [M] main > - [D] develop > - [K] Keep "master" > > The vote will last at least 72 hours. > The name who gets the most votes (and >= 3 votes) wins. > > Best, > ----------------------------------- > Xiangdong Huang > School of Software, Tsinghua University > > 黄向东 > 清华大学 软件学院 > > -- > Kevin A. McGrail > [email protected] > > Member, Apache Software Foundation > Chair Emeritus Apache SpamAssassin Project > https://www.linkedin.com/in/kmcgrail - 703.798.0171 >
