great thanks Suresh, I think we should merge these with extreme prejudice so we can smoothen our way of working in time before the 4.16 release pressure kicks in.
On Mon, Apr 26, 2021 at 4:02 PM Suresh Anaparti < suresh.anapa...@shapeblue.com> wrote: > Hi all, > > Here is the list of CloudStack repos and respective renaming PRs, which > renames default git branch name from ‘master’ to ‘main’ and replaces some > offensive words/terms as appropriate for inclusiveness. These PRs are > raised against master branch, and should be accepted first before > proceeding with the actual renaming of the default git branch name from > ‘master’ to ‘main’. > > - cloudstack => PR: https://github.com/apache/cloudstack/pull/4922 > - cloudstack-documentation => PR: > https://github.com/apache/cloudstack-documentation/pull/155 > - cloudstack-www => PR: https://github.com/apache/cloudstack-www/pull/83 > - cloudstack-cloudmonkey => PR: > https://github.com/apache/cloudstack-cloudmonkey/pull/76 > - cloudstack-kubernetes-provider => PR: > https://github.com/apache/cloudstack-kubernetes-provider/pull/29 > - cloudstack-ec2stack => PR: > https://github.com/apache/cloudstack-ec2stack/pull/2 > - cloudstack-gcestack => PR: > https://github.com/apache/cloudstack-gcestack/pull/3 > > I’ll start a voting thread sometime later this week, with the integration > steps. > > Please let me know your thoughts/suggestions. > > Regards, > Suresh > > On 01/04/21, 2:47 PM, "Suresh Anaparti" <suresh.anapa...@shapeblue.com> > wrote: > > Thank you Rohit, Paul, Simon, Gabriel for your response on this > proposal, and agreeing to the change. > > I've created a ticket here: > https://github.com/apache/cloudstack/issues/4887, to check the impacted > systems/endpoints and track the changes. I agree with what Paul mentioned, > it is better to deprecate master as soon as renaming change is done, and > the changes (in all the impacted systems/endpoints) should be completed in > short window time. > > Regards, > Suresh > > On 30/03/21, 8:36 PM, "Paul Angus" <p...@angus.uk.com.INVALID> wrote: > > Maybe we could add main immediately and depricate master > immediately after the next full release. I'd be -1 on any longer. > Otherwise they'll _always_ be someone who wants 'a little bit more time'. > > Kind regards > > > > Paul Angus > > > ________________________________ > From: Wei ZHOU <ustcweiz...@gmail.com> > Sent: Tuesday, March 30, 2021 3:57:25 PM > To: dev@cloudstack.apache.org <dev@cloudstack.apache.org> > Subject: Re: [DISCUSS] Renaming default git branch name from > 'master' to 'main' > > yeah. > It is a small change on github, but it has large impacts. > we can keep both 'main' and 'master' branches for a period of > time, and > keep them sync (e.g. by cron job). > > -Wei > > > suresh.anapa...@shapeblue.com > www.shapeblue.com > 3 London Bridge Street, 3rd floor, News Building, London SE1 9SGUK > @shapeblue > > > > > suresh.anapa...@shapeblue.com > www.shapeblue.com > 3 London Bridge Street, 3rd floor, News Building, London SE1 9SGUK > @shapeblue > > > > On Mon, 29 Mar 2021 at 09:46, Rohit Yadav <rohit.ya...@shapeblue.com> > wrote: > > > Agree with your proposal Suresh, we need to review all > endpoint/systems > > that integrate which many likely break won't work after the > update, to list > > a few we need to manage post such a change: > > > > * Rename and push the branch and request ASF infra to change > default > > branch to 'main' in Github repo settings for all the repos > > * Travis and Jenkins/ASF integration > > * Community/external CI systems that do rpm/deb packaging, UI > > building, apidocs and systemvmtemplate builds; website and > project docs > > repos build jobs > > * Git mirrors including the ASF mirror (unless we need to do > something > > different) > > * Update usage of 'master' branch on project website, cwiki, > internal > > readme/install docs > > * External docs/blogs/repos/integration and 3rd party > tools/libraries > > that intergrate/use/link with CloudStack > > * Check if Github/Git support a way to still allow pulling > from > > 'master' branch which internally links to 'main' (some like of > aliasing > > like > > > https://stackoverflow.com/questions/549920/is-it-possible-to-alias-a-branch-in-git/549949#549949 > > ) > > > > Regards. > > ________________________________ > > From: Simon Weller <swel...@ena.com.INVALID> > > Sent: Thursday, March 25, 2021 21:08 > > To: dev <dev@cloudstack.apache.org> > > Subject: Re: [DISCUSS] Renaming default git branch name from > 'master' to > > 'main' > > > > +1 > > ________________________________ > > From: Gabriel Beims Bräscher <gabr...@apache.org> > > Sent: Thursday, March 25, 2021 6:56 AM > > To: dev <dev@cloudstack.apache.org> > > Subject: Re: [DISCUSS] Renaming default git branch name from > 'master' to > > 'main' > > > > I am +1 on migrating from 'master' to 'main' branch. > > > > We will need to update some scripts, documentations, and the > releasing > > process. > > > > Regards, > > Gabriel. > > > > On Thu, Mar 25, 2021, 08:10 <pau...@apache.org> wrote: > > > > > Personally, I'm +1 on this change. > > > > > > > > > > > > > > > Kind regards > > > > > > Paul Angus > > > > > > -----Original Message----- > > > From: Suresh Anaparti <suresh.anapa...@shapeblue.com> > > > Sent: Thursday, March 25, 2021 9:23 AM > > > To: dev@cloudstack.apache.org > > > Subject: Re: [DISCUSS] Renaming default git branch name from > 'master' to > > > 'main' > > > > > > Yes Wei, all the integrated systems / scripts (using the > CloudStack git > > > repositories) have to replace the default branch name to > 'main' wherever > > > applicable. > > > > > > Regard > > > Suresh > > > > > > On 25/03/21, 2:44 PM, "Wei ZHOU" <ustcweiz...@gmail.com> > wrote: > > > > > > Will it impact jenkins/travis/trillian and prs ? > > > > > > -Wei > > > > > > On Thu, 25 Mar 2021 at 10:00, Suresh Anaparti < > > > suresh.anapa...@shapeblue.com> > > > wrote: > > > > > > > Hi all, > > > > > > > > The default git branch name 'master' was replaced with > 'main' on > > > GitHub > > > > [2][3] and in the wider Git community [4]. For those > that have > > > missed the > > > > broader discussion in society, the term 'master' is > offensive to > > some > > > > people [1]. This is widely considered insensitive if not > illegal, > > > hence the > > > > proposed change. > > > > > > > > It seems fitting the CloudStack would follow this > example of > > > > inclusiveness. For this, the project would rename its > default > > branch > > > name > > > > of all the repositories to 'main'. In addition, all the > applicable > > > > integration points (Eg: Travis-CI, etc) using these > repositories > > > have to > > > > replace the branch name 'master' with 'main'. > > > > > > > > The sample steps to rename and replace the default > branch to 'main' > > > are > > > > here: > > > > > > > > > > https://faun.pub/git-step-by-step-renaming-a-master-branch-to-main-16390ca7577b > > > > > > > > I would like to hear your thoughts and suggestions on > this. > > > > > > > > > > > > [1] > > > > > > > > > > https://www.theserverside.com/feature/Why-GitHub-renamed-its-master-branch-to-main > > > > [2] > > > > > > > > > > https://www.techrepublic.com/article/github-to-replace-master-with-main-starting-in-october-what-developers-need-to-know > > > > [3] https://github.com/github/renaming > > > > [4] > > > > https://about.gitlab.com/blog/2021/03/10/new-git-default-branch-name/ > > > > > > > > > > > > Regards, > > > > Suresh > > > > > > > > > > > > suresh.anapa...@shapeblue.com > > > > www.shapeblue.com<http://www.shapeblue.com> > > > > 3 London Bridge Street, 3rd floor, News Building, > London SE1 > > 9SGUK > > > > @shapeblue > > > > > > > > > > > > > > > > > > > > > > > > > suresh.anapa...@shapeblue.com > > > www.shapeblue.com<http://www.shapeblue.com> > > > 3 London Bridge Street, 3rd floor, News Building, London SE1 > 9SGUK > > > @shapeblue > > > > > > > > > > > > > > > > > > > rohit.ya...@shapeblue.com > > www.shapeblue.com<http://www.shapeblue.com> > > 3 London Bridge Street, 3rd floor, News Building, London SE1 > 9SGUK > > @shapeblue > > > > > > > > > > > -- Daan
