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.

Sign up for GitHub

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

Jump to bottom

Update dev-tr branch - merge main #2303

Merged
merged 23 commits into from
Aug 16, 2023
Merged

Update dev-tr branch - merge main #2303

merged 23 commits into from
Aug 16, 2023

Conversation

aliok
Copy link
Member

@aliok aliok commented Aug 16, 2023

Describe your changes

Related issue number or link (ex: resolves #issue-number)

Checklist before opening this PR (put x in the checkboxes)

  • This PR does not contain plagiarism
    • don’t copy other people’s work unless you are quoting and contributing it to them.
  • I have signed off on all commits
    • signing off (ex: git commit -s) is to affirm that commits comply DCO. If you are working locally, you could add an alias to your gitconfig by running git config --global alias.ci "commit -s".

jihoon-seo and others added 23 commits July 13, 2023 11:07
@jihoon-seo
Update config.toml to resolve warnings
ebe05ae 
Signed-off-by: Jihoon Seo <[email protected]>
@jihoon-seo
[bn] Fix error in 'Bare Metal Machine'
92715ea 
Signed-off-by: Jihoon Seo <[email protected]>
@jihoon-seo
Remove links to 'container-image'
853d684 
Signed-off-by: Jihoon Seo <[email protected]>
@jihoon-seo
Remove links to 'load-balancer'
90cb58e 
Signed-off-by: Jihoon Seo <[email protected]>
@jihoon-seo
Remove links to 'stateless-apps'
64989b5 
Signed-off-by: Jihoon Seo <[email protected]>
@jihoon-seo
Remove links to 'database-as-a-service'
eac0284 
Signed-off-by: Jihoon Seo <[email protected]>
@jihoon-seo
Remove links to 'debugging'
d7ce52b 
Signed-off-by: Jihoon Seo <[email protected]>
@jihoon-seo
Remove links to 'software-as-a-service'
1d46166 
Signed-off-by: Jihoon Seo <[email protected]>
@jihoon-seo
Remove links to 'version-control'
86ef3d1 
Signed-off-by: Jihoon Seo <[email protected]>
@dependabot
Bump rojopolis/spellcheck-github-actions from 0.33.0 to 0.33.1
bf56658 
Bumps [rojopolis/spellcheck-github-actions](https://github.com/rojopolis/spellcheck-github-actions) from 0.33.0 to 0.33.1.
- [Release notes](https://github.com/rojopolis/spellcheck-github-actions/releases)
- [Changelog](https://github.com/rojopolis/spellcheck-github-actions/blob/master/CHANGELOG.md)
- [Commits](rojopolis/spellcheck-github-actions@0.33.0...0.33.1)

---
updated-dependencies:
- dependency-name: rojopolis/spellcheck-github-actions
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@guillaumebernard84
[en] update idempotence
d6a8d35 
Signed-off-by: Guillaume Bernard <[email protected]>
@seokho-son
Merge pull request #2236 from cncf/dependabot/github_actions/rojopoli…
a3472bc 
…s/spellcheck-github-actions-0.33.1

Bump rojopolis/spellcheck-github-actions from 0.33.0 to 0.33.1
@sestegra
[dev-fr] Add missing sestegra for merge
17c9db6 
Signed-off-by: Stéphane Este-Gracias <[email protected]>
@nate-double-u
Updating how server is launched locally (#2222)
b346bf4 
updating how server is launched locally
adding dev dependencies to support
adding netlify.toml and specifying node and hugo versions

Signed-off-by: Nate W <[email protected]>
@seokho-son
Merge pull request #2224 from jihoon-seo/230713_Update_config.toml_to…
8865db9 
…_resolve_warnings

Update `config.toml` to resolve warnings
@seokho-son
Merge pull request #2238 from sestegra/main-dev-fr-approver
17f5a02 
Add missing sestegra for merging into dev-fr
@adamdmharvey
chore: Fix whitespace and a few trivial typos (#2250)
a42311b 
* chore: Fix whitespace issues

Signed-off-by: Adam Harvey <[email protected]>

* fix: Typo with double word

Signed-off-by: Adam Harvey <[email protected]>

* chore: Typo in comment

Signed-off-by: Adam Harvey <[email protected]>

---------

Signed-off-by: Adam Harvey <[email protected]>
@castrojo
Merge pull request #2237 from guillaumebernard84/dev-en-idempotence
f7c04b5 
[EN] update idempotence
@jihoon-seo
Add 'xx.toml' entries to CODEOWNERS (#2216)
6bfe087 
Signed-off-by: Jihoon Seo <[email protected]>
@electrocucaracha @jihoon-seo
Enable check outdated gh action in dev-es (#2190)
3a887fb 
* Enable check outdated gh action in dev-es

Signed-off-by: Victor Morales <[email protected]>

* Enable zh-tw locale code

Co-authored-by: Jihoon Seo <[email protected]>
Signed-off-by: Victor Morales <[email protected]>

* Improve discover L10N_CODE code

Signed-off-by: Victor Morales <[email protected]>

---------

Signed-off-by: Victor Morales <[email protected]>
Co-authored-by: Jihoon Seo <[email protected]>
@seokho-son
Merge pull request #2198 from jihoon-seo/230706_Remove_links_to_depre…
f0d2b9d 
…cated_terms

Remove links to 'Deprecated' / 'Feedback Appreciated' terms
@yunkon-kim
Update path pattern in .github/labeler.yml (#2280)
832ef92 
Signed-off-by: Yunkon Kim <[email protected]>
@akshatcoder-hash @CathPag
@nate-double-u @iamNoah1 @castrojo
[EN] add Runtime (#2033)
2555437 
* [EN] New Term- Runtime

Signed-off-by: Akshat Sharma <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Akshat Sharma <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Akshat Sharma <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Akshat Sharma <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Akshat Sharma <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Nate W. <[email protected]>
Signed-off-by: Catherine Paganini <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Nate W. <[email protected]>
Signed-off-by: Catherine Paganini <[email protected]>

* Update content/en/runtime.md

Signed-off-by: Catherine Paganini <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Noah Ispas <[email protected]>
Signed-off-by: Akshat Sharma <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Nate W. <[email protected]>
Signed-off-by: Akshat Sharma <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Jorge O. Castro <[email protected]>
Signed-off-by: Noah Ispas <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Noah Ispas <[email protected]>
Signed-off-by: Jorge O. Castro <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Noah Ispas <[email protected]>
Signed-off-by: Jorge O. Castro <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Noah Ispas <[email protected]>
Signed-off-by: Jorge O. Castro <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Noah Ispas <[email protected]>
Signed-off-by: Jorge O. Castro <[email protected]>

* fix: cut out examples

Signed-off-by: Jorge O. Castro <[email protected]>

* fix: add section on the problem it addresses

Signed-off-by: Jorge O. Castro <[email protected]>

* Update runtime.md

removed empty lines

Signed-off-by: Noah Ispas <[email protected]>

* Update content/en/runtime.md

Signed-off-by: Noah Ispas <[email protected]>

* Update content/en/runtime.md

Signed-off-by: Noah Ispas <[email protected]>

* Update runtime.md

Fix spelling, the rest depends on this landing: #2244

Signed-off-by: Jorge O. Castro <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Nate W <[email protected]>
Signed-off-by: Jorge O. Castro <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Nate W <[email protected]>
Signed-off-by: Jorge O. Castro <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Nate W <[email protected]>
Signed-off-by: Jorge O. Castro <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Nate W <[email protected]>
Signed-off-by: Jorge O. Castro <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Nate W <[email protected]>
Signed-off-by: Jorge O. Castro <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Nate W <[email protected]>
Signed-off-by: Jorge O. Castro <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Nate W <[email protected]>
Signed-off-by: Jorge O. Castro <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Nate W <[email protected]>
Signed-off-by: Jorge O. Castro <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Nate W <[email protected]>
Signed-off-by: Jorge O. Castro <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Nate W <[email protected]>
Signed-off-by: Jorge O. Castro <[email protected]>

* add cgroups, namespaces, and orchestrator to wordlist

Signed-off-by: Jorge O. Castro <[email protected]>

* Update content/en/runtime.md

Signed-off-by: Nate W <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Nate W <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Nate W <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Nate W <[email protected]>
Signed-off-by: Catherine Paganini <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Akshat Sharma <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Akshat Sharma <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Akshat Sharma <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Akshat Sharma <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Akshat Sharma <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Akshat Sharma <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Akshat Sharma <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Akshat Sharma <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Akshat Sharma <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Akshat Sharma <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Noah Ispas <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Noah Ispas <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Noah Ispas <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Noah Ispas <[email protected]>
Signed-off-by: Catherine Paganini <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Noah Ispas <[email protected]>
Signed-off-by: Catherine Paganini <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Noah Ispas <[email protected]>
Signed-off-by: Catherine Paganini <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Noah Ispas <[email protected]>
Signed-off-by: Catherine Paganini <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Noah Ispas <[email protected]>
Signed-off-by: Catherine Paganini <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Noah Ispas <[email protected]>
Signed-off-by: Catherine Paganini <[email protected]>

* Update runtime.md

Signed-off-by: Catherine Paganini <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Catherine Paganini <[email protected]>
Signed-off-by: Noah Ispas <[email protected]>

* Update content/en/runtime.md

Co-authored-by: Noah Ispas <[email protected]>
Signed-off-by: Catherine Paganini <[email protected]>

---------

Signed-off-by: Akshat Sharma <[email protected]>
Signed-off-by: Catherine Paganini <[email protected]>
Signed-off-by: Noah Ispas <[email protected]>
Signed-off-by: Jorge O. Castro <[email protected]>
Signed-off-by: Nate W <[email protected]>
Co-authored-by: Catherine Paganini <[email protected]>
Co-authored-by: Nate W. <[email protected]>
Co-authored-by: Noah Ispas <[email protected]>
Co-authored-by: Jorge O. Castro <[email protected]>
@netlify
Copy link

netlify bot commented Aug 16, 2023 •
edited
Loading

✅ Deploy Preview for cncfglossary ready!

Name Link
🔨 Latest commit 2555437
🔍 Latest deploy log https://app.netlify.com/sites/cncfglossary/deploys/64dc9282d0adc200089fade9
😎 Deploy Preview https://deploy-preview-2303--cncfglossary.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@github-actions github-actions bot added lang/en for English lang/pt for Portuguese lang/it for Italian lang/hi for Hindi lang/ko for Korean lang/de for German lang/bn for Bengali lang/es for Spanish lang/zh for Chinese labels Aug 16, 2023
@aliok
Copy link
Member Author

aliok commented Aug 16, 2023

@seokho-son
Can you bypass DCO again, similar to #2234 (comment) ?

I updated the dev-tr branch by merging main into it.

Is there a better way of doing this? I can try rebasing onto main (instead of merging main into dev-tr), but that needs me to "force push" on dev-tr and I don't want prefer that.

@seokho-son
Copy link
Collaborator

Thank you, @aliok.
Given the circumstances, this PR is the optimal approach. By using the upstream branches to update the dev branch, we can ensure that no changes were made by the contributor, eliminating the need for an in-depth review of the PR's content.

In case of this PR, approvers do not need to review the content itself.
(just updating upsteam/dev branch based on upsteam/main)

Let me force merge this PR as a maintainer.

I set bypass the DCO manually as well (the DCO issue is not from this PR)

seokho-son
seokho-son approved these changes Aug 16, 2023
View reviewed changes
Copy link
Collaborator

@seokho-son seokho-son left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@seokho-son seokho-son merged commit 7e728a1 into dev-tr Aug 16, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hanyuancheung hanyuancheung hanyuancheung approved these changes

@seokho-son seokho-son seokho-son approved these changes

@Jacob953 Jacob953 Awaiting requested review from Jacob953 Jacob953 is a code owner

@Rocksnake Rocksnake Awaiting requested review from Rocksnake Rocksnake is a code owner

@Submarinee Submarinee Awaiting requested review from Submarinee Submarinee is a code owner

@Saim-Safdar Saim-Safdar Awaiting requested review from Saim-Safdar Saim-Safdar is a code owner

@waleed318 waleed318 Awaiting requested review from waleed318 waleed318 is a code owner

@edsoncelio edsoncelio Awaiting requested review from edsoncelio edsoncelio is a code owner

@brunoguidone brunoguidone Awaiting requested review from brunoguidone brunoguidone is a code owner

@jessicalins jessicalins Awaiting requested review from jessicalins jessicalins is a code owner

@MrErlison MrErlison Awaiting requested review from MrErlison MrErlison is a code owner

@jihoon-seo jihoon-seo Awaiting requested review from jihoon-seo jihoon-seo is a code owner

@yunkon-kim yunkon-kim Awaiting requested review from yunkon-kim yunkon-kim is a code owner

@fsbaraglia fsbaraglia Awaiting requested review from fsbaraglia fsbaraglia is a code owner

@ugho16 ugho16 Awaiting requested review from ugho16 ugho16 is a code owner

@annalisag-spark annalisag-spark Awaiting requested review from annalisag-spark annalisag-spark is a code owner

@sistella sistella Awaiting requested review from sistella sistella is a code owner

@Garima-Negi Garima-Negi Awaiting requested review from Garima-Negi Garima-Negi is a code owner

@sayantani11 sayantani11 Awaiting requested review from sayantani11

@anubha-v-ardhan anubha-v-ardhan Awaiting requested review from anubha-v-ardhan

@jayesh-srivastava jayesh-srivastava Awaiting requested review from jayesh-srivastava jayesh-srivastava is a code owner

@raelga raelga Awaiting requested review from raelga raelga is a code owner

@ramrodo ramrodo Awaiting requested review from ramrodo ramrodo is a code owner

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha electrocucaracha is a code owner

@krol3 krol3 Awaiting requested review from krol3 krol3 is a code owner

@92nqb 92nqb Awaiting requested review from 92nqb 92nqb is a code owner

@iamNoah1 iamNoah1 Awaiting requested review from iamNoah1 iamNoah1 is a code owner

@DaveVentura DaveVentura Awaiting requested review from DaveVentura DaveVentura is a code owner

@CathPag CathPag Awaiting requested review from CathPag CathPag is a code owner

@bcubk bcubk Awaiting requested review from bcubk bcubk is a code owner

@Arindam200 Arindam200 Awaiting requested review from Arindam200 Arindam200 is a code owner

@Imtiaz1234 Imtiaz1234 Awaiting requested review from Imtiaz1234 Imtiaz1234 is a code owner

@mitul3737 mitul3737 Awaiting requested review from mitul3737 mitul3737 is a code owner

@sajibAdhi sajibAdhi Awaiting requested review from sajibAdhi sajibAdhi is a code owner

@caniszczyk caniszczyk Awaiting requested review from caniszczyk caniszczyk is a code owner

@JasonMorgan JasonMorgan Awaiting requested review from JasonMorgan

@nate-double-u nate-double-u Awaiting requested review from nate-double-u nate-double-u is a code owner

@castrojo castrojo Awaiting requested review from castrojo castrojo is a code owner

Assignees
No one assigned
Labels
lang/bn for Bengali lang/de for German lang/en for English lang/es for Spanish lang/hi for Hindi lang/it for Italian lang/ko for Korean lang/pt for Portuguese lang/zh for Chinese
Projects
CNCF glossary definition review board
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.