Re: [DISCUSS] Renaming default git branch name from 'master' to 'main'
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" 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 y
[GitHub] [cloudstack-www] sureshanaparti commented on pull request #83: Inclusivity changes for CloudStack - rename some offensive words/terms as appropriate
sureshanaparti commented on pull request #83: URL: https://github.com/apache/cloudstack-www/pull/83#issuecomment-831732241 > 22383 files with over 44000 lines changed in a single commit may hurt repo-wise... if this is merged, ensure that repo packing, garbage collecting, and index-updating is done and maybe a comparison of pre-merge to post-merge size is evaluated. Also, there is _no_ way anybody is reasonably doing a human review on this for real. :) > > Alternatively, do we really need to be updating the HTML tags for 4.0.0 API documentation from [8?] years ago? Maybe it would be better to just age it off, or put a readme about terminology changes and just change 4.14+ versions. Otherwise, I could see this becoming a repeated effort if other terms are deemed "offensive" in the future. And I'd really rather not start having tens of thousands of changed source code lines be "normal" behavior for a source code repo. @nathanmcgarvey Thanks for the review, will remove the relevant changes from the old apidocs. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack-documentation] shwstppr commented on pull request #199: ui: added customization details
shwstppr commented on pull request #199: URL: https://github.com/apache/cloudstack-documentation/pull/199#issuecomment-831764812 @blueorangutan docbuild -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack-documentation] blueorangutan commented on pull request #199: ui: added customization details
blueorangutan commented on pull request #199: URL: https://github.com/apache/cloudstack-documentation/pull/199#issuecomment-831765438 @shwstppr a Jenkins job has been kicked to build the document. I'll keep you posted as I make progress. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack-documentation] blueorangutan commented on pull request #199: ui: added customization details
blueorangutan commented on pull request #199: URL: https://github.com/apache/cloudstack-documentation/pull/199#issuecomment-831765920 Doc build preview: http://qa.cloudstack.cloud/docs/WIP-PROOFING/pr/199. (SL-JID 54) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack-kubernetes-provider] rhtyd merged pull request #30: Updating kubernetes version
rhtyd merged pull request #30: URL: https://github.com/apache/cloudstack-kubernetes-provider/pull/30 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack-kubernetes-provider] rhtyd closed issue #28: There is a vulnerability in kubernetes v1.18.2 ,upgrade recommended
rhtyd closed issue #28: URL: https://github.com/apache/cloudstack-kubernetes-provider/issues/28 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack-kubernetes-provider] rhtyd commented on a change in pull request #29: Inclusivity changes for CloudStack - rename some offensive words/terms as appropriate, that are meaningful an
rhtyd commented on a change in pull request #29:
URL:
https://github.com/apache/cloudstack-kubernetes-provider/pull/29#discussion_r625988965
##
File path: cloudstack_loadbalancer.go
##
@@ -121,8 +121,8 @@ func (cs *CSCloud) EnsureLoadBalancer(ctx context.Context,
clusterName string, s
klog.V(4).Infof("Load balancer %v is associated with IP %v", lb.name,
lb.ipAddr)
- // Fetch the IP whitelist from the spec if any
- //whitelist = service.Spec.LoadBalancerSourceRanges
+ // Fetch the IP allowlist from the spec if any
+ //allowlist = service.Spec.LoadBalancerSourceRanges
Review comment:
why keep commented code, should we remove this @davidjumani
@sureshanaparti ?
##
File path: Makefile
##
@@ -21,7 +21,7 @@ GIT_COMMIT_SHORT=$(shell git rev-parse --short HEAD)
GIT_TAG=$(shell git describe --abbrev=0 --tags 2>/dev/null || echo v0.0.0)
GIT_IS_TAG=$(shell git describe --exact-match --abbrev=0 --tags 2>/dev/null ||
echo NOT_A_TAG)
ifeq (${GIT_IS_TAG},NOT_A_TAG)
-GIT_VERSION?=$(patsubst v%,%,${GIT_TAG})-master+${GIT_COMMIT}
+GIT_VERSION?=$(patsubst v%,%,${GIT_TAG})-main+${GIT_COMMIT}
Review comment:
@davidjumani can you check again cc @sureshanaparti ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [cloudstack-www] rhtyd commented on pull request #83: Inclusivity changes for CloudStack - rename some offensive words/terms as appropriate
rhtyd commented on pull request #83: URL: https://github.com/apache/cloudstack-www/pull/83#issuecomment-832131903 @sureshanaparti pl address changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack-documentation] rhtyd merged pull request #182: add nodejs as dependency for building from source
rhtyd merged pull request #182: URL: https://github.com/apache/cloudstack-documentation/pull/182 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack-documentation] rhtyd merged pull request #187: Disk provisioning types vmware
rhtyd merged pull request #187: URL: https://github.com/apache/cloudstack-documentation/pull/187 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
