Thanks Gabriel, for sharing your insights on this change.
GitHub, GitLab, Bitbucket and other players have already accepted this change
for inclusiveness, and renamed the default branch to 'main'. Sometime or other,
CloudStack has to take this change, to be in-line with the Git community.
The main objective here, is to make the community more inclusive place for
everyone globally. This requires renaming the default branch to 'main' (as
others) in the CloudStack related git repositories and replacing the offensive
words in source code, file names and documentation. Please note that the third
party / dependency libraries, the terminologies used from external systems
(storage, hypervisor, etc) and deprecated / archived repositories (Eg.
cloudstack-primate) are excluded from this change.
Regards,
Suresh
On 03/05/21, 8:55 PM, "Gabriel Bräscher" <gabrasc...@gmail.com> wrote:
Hi all,
For the record, there have been some discussions on the [VOTE] thread (
https://markmail.org/thread/n6sbl3vgm7hy77zj) that have not been addressed
here.
Having such a discussion is way better than not having it. I would like to
thank you all (both mail threads) for bringing points of view and being
open-minded with anyone's opinion and background.
So far I have been quietly voting +1 on both mail threads. However, I will
raise the reasons behind it.
I used two factors when voting for it: a) technical view; b) personal point
of view.
a) First, let's aim just at the technical part -- that also carries some
personal point of view:
The fact that major players, such as GitHub itself, are changing their
patterns will not impact us right now, it will definitely take some time to
impact us all. But as soon as people get used to the new default branch, it
will become the first and only option for many developers. I would bet that
it will take about 5 years when the (today) students will become graduated
in many IT fields and o out with their default branch as the "main" branch.
It is important to understand how big GitHub is in the software development
industry; probably we will soon get more and more big players aiming
towards that direction.
We have two options: "fight" with this, or "accept" and become part of such
a standard avoiding becoming "the project with a legacy branch
architecture" in 2025.
Additionally, when describing the "master" branch to someone that has no
idea of GIT (e.g. an IT student, or anyone that think we from IT are all a
bunch of crazy geeks) it is quite easy to tell for the person that this is
the "default" branch, or the "main" branch, the first branch, root branch,
or whatever. The point here is that I normally would search for better
words to express the "master" branch meaning.
So, why not change to a name that has instant meaning and also will become
the next IT industry standard?
b) personal point of view -- my background, country of origin, culture,
generation, etc :-)
I don't feel uncomfortable with the word master isolated in the context of
branches, as there is no slave or servant attached to the definition of a
default branch.
The default branch is the source of "truth" and the "master" world can fit
very well with that definition.
On the other hand. there are also other options that perfectly describe the
"default" branch, as raised in the "technical" arguments.
Like many words, it can carry multiple meanings that fit in each context.
There is the "Master of Science" degree; as well as the "master <>
apprentice" relation; and of course, it is always a good thing when someone
"masters" a knowledge. However, I perfectly understand that the IT industry
and academic world adopts widely the term "master <> slave", which can help
people to feel uncomfortable with the word "master".
Additionally, the first meanings that any dictionary brings normally are
not "nice" ones [1]:
> (I) the person who owns, cares for, and controls an animal:
> "With careful training, a dog will obey its master completely."
> (II) a person who employs a servant or owns a slave:
> "Servants had to obey their masters."
> (III) a person who has control over a particular situation:
> "She was the victim of her circumstances rather than the master of her
> fate."
> (IV) and even, the captain of a ship that carries goods :
> "Ship's masters are in charge of a ship, its crew and any cargo it is
> carrying, at sea and in port."
> (V) a person who is very skilled in a particular job or activity:
> "He was a master of disguise."
> (VI) a famous and very skilled painter:
> "This painting is clearly the work of a master."
> (VII) a male school teacher:
> "Mr. Wells was my Latin master at school."
>
[1] https://dictionary.cambridge.org/us/dictionary/english/master
And you get the point ... it all depends on the context.
The world is changing and allowing us to raise and openly discuss some
taboos that would never be possible a couple of decades ago.
I don't believe that we are making the world any better by changing the
default branch name. Maybe some decades in the future these small changes
will payout (or not). But I believe that the fact that we are opening such
discussions allows us to very slowly improve society.
CONCLUSION:
+1: I don't see any harm in changing the "main" branch name, and I do
understand the reasons why. I also believe that as long as big players on
IT migrate to such a pattern it will be a question of WHEN but not IF.
Em ter., 27 de abr. de 2021 às 09:41, Daan Hoogland
<daan.hoogl...@gmail.com>
escreveu:
> 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
>
