Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Black Lives Matter #1554

Merged
merged 2 commits into from
Jun 5, 2020
Merged

Conversation

camilamacedo86
Copy link
Member

Cherry-pick : #1553

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 5, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: camilamacedo86

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 5, 2020
@camilamacedo86
Copy link
Member Author

camilamacedo86 commented Jun 5, 2020

HI @DirectXMan12 to appears in https://book.kubebuilder.io/quick-start.html we need to put in this branch. Is possible to force the merge since we would not like to update all with the master?

/assign @DirectXMan12
/assign @mengqiy

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 5, 2020
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 5, 2020
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jun 5, 2020
@DirectXMan12 DirectXMan12 reopened this Jun 5, 2020
@DirectXMan12
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 5, 2020
Inclusive is better than exclusive: this is a core principal of
Kubernetes.

When people are systematically murdered, dehumanized, marginalized,
threatened, and made to feel unwelcome, it's our job to make it clear
that such things will not fly in our community, and must not be allowed
to fly in society.

Without inclusivity, there is no community, and without community, there
is no Kubernetes, there is no KubeBuilder.

---

Verbiage and general design taken from the main Kubernetes website
(kubernetes/website#21505).
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 5, 2020
The addon project testdata has deps that are somehow out of wack
(presumably a partial cherry-pick or something).  This fixes that.
@DirectXMan12
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 5, 2020
@k8s-ci-robot k8s-ci-robot merged commit ae37bef into kubernetes-sigs:book-v2 Jun 5, 2020
@camilamacedo86 camilamacedo86 deleted the book-v2-blm branch June 6, 2020 14:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants