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

[hi] Rebasing dev-hi branch with main branch #1690

Merged
merged 327 commits into from
Feb 7, 2023
Merged

[hi] Rebasing dev-hi branch with main branch #1690

merged 327 commits into from
Feb 7, 2023

Conversation

shivaabhishek07
Copy link

@shivaabhishek07 shivaabhishek07 commented Feb 4, 2023 •
edited by seokho-son
Loading

Describe your changes

Rebasing the dev-hi branch with the main branch.

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

ref #1681

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".

gamba47 and others added 30 commits August 17, 2022 11:22
@gamba47
[ES] add content/es/auto_scaling.md (#1231)
0fc040e 
* [ES] add content/es/auto_scaling.md
* Fix wordlist add autoescalado
* Rebase wordlist
* Sort wordlist

Signed-off-by: Emiliano <emilianovazquez@gmail.com>
@seokho-son
Merge pull request #1236 from cncf/main
768af86 
Update dev-ko branch with main branch
@seokho-son
Create a pull request template (#1234)
2c3ffe1
@ramrodo
[es] Localize cloud-native-tech.md (#1193)
0a92f7e 
* [es] Localize cloud-native-tech.md
* Revert change from resolving conflicts

Signed-off-by: Rodolfo Martínez Vega <rodomar@outlook.com>
@cjyabraham
update the social share image
45c338b 
Signed-off-by: cjyabraham <cjyabraham@gmail.com>
@electrocucaracha
Add Nicolas Quiceno to Spanish approver team (#1192)
047529e 
Signed-off-by: Victor Morales <chipahuac@hotmail.com>
@HenokB
Link "virtual machine" and "cloud native" (#1167)
04eee59 
* Link "virtual machine" and "cloud native"

Signed-off-by: Henok Biadglign Ademtew <46082799+HenokB@users.noreply.github.com>

* Link "virtual machine" and "cloud native" 

Signed-off-by: Henok Biadglign Ademtew <46082799+HenokB@users.noreply.github.com>

Signed-off-by: Henok Biadglign Ademtew <46082799+HenokB@users.noreply.github.com>
@SeolRoh @yunkon-kim @seokho-son
[ko] translation service-discovery (#1132)
99a3604 
* [ko] translation service-discovery

Signed-off-by: rohseol <seven800@naver.com>
Signed-off-by: Seokho Son <shsongist@gmail.com>
Signed-off-by: Yunkon Kim  <7975459+yunkon-kim@users.noreply.github.com>
Co-authored-by: Yunkon Kim  <7975459+yunkon-kim@users.noreply.github.com>
Co-authored-by: Seokho Son <shsongist@gmail.com>
@seokho-son @CathPag
Update description of Cloud Native Glossary Repo (#1279)
cfc745f 
* Update description of Cloud Native Glossary Repo

Signed-off-by: Seokho Son <shsongist@gmail.com>

* Rev 01

Signed-off-by: Seokho Son <shsongist@gmail.com>

* Update .github/settings.yml

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
Signed-off-by: Seokho Son <shsongist@gmail.com>

Signed-off-by: Seokho Son <shsongist@gmail.com>
Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
@cjyabraham
Stop incomplete terms from showing up in search results and tag listi…
f020498 
…ng pages (#1292)

Signed-off-by: cjyabraham <cjyabraham@gmail.com>
@bconfiden2
[ko] Translate 'Scalability' into Korean (#1238)
1cda362 
Signed-off-by: bconfiden2 <bconfiden2@naver.com>
@kidae92
[ko] Translate 'Cluster' (#1131)
1e12c22 
Signed-off-by: kidae92 <kidae92@hanmail.net>
@sergeyborovoy @CathPag @jihoon-seo
Create multitenancy.md (#1154)
12a1bd6 
* Create multitenancy.md

If the "What it is" section looks too verbose, the last 1 or even 2 paragraphs of it can be deleted, although I have re-read everything carefully and do believe that they provide important supplementary information that is not redundant.

I confirm that this is completely my own work, although in the world of term definitions you can always find fragments similar to each other even if they were developed independently.

Signed-off-by: Sergey Borovoy <48699431+sergeyborovoy@users.noreply.github.com>

* Update content/en/multitenancy.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
Signed-off-by: Sergey Borovoy <48699431+sergeyborovoy@users.noreply.github.com>

* Update content/en/multitenancy.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
Signed-off-by: Sergey Borovoy <48699431+sergeyborovoy@users.noreply.github.com>

* Update content/en/multitenancy.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
Signed-off-by: Sergey Borovoy <48699431+sergeyborovoy@users.noreply.github.com>

* Update content/en/multitenancy.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
Signed-off-by: Sergey Borovoy <48699431+sergeyborovoy@users.noreply.github.com>

* Update multitenancy.md

Signed-off-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

* Update content/en/multitenancy.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
Signed-off-by: Sergey Borovoy <48699431+sergeyborovoy@users.noreply.github.com>

* Update content/en/multitenancy.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
Signed-off-by: Sergey Borovoy <48699431+sergeyborovoy@users.noreply.github.com>

* Update content/en/multitenancy.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
Signed-off-by: Sergey Borovoy <48699431+sergeyborovoy@users.noreply.github.com>

* Update content/en/multitenancy.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
Signed-off-by: Sergey Borovoy <48699431+sergeyborovoy@users.noreply.github.com>

* Update content/en/multitenancy.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
Signed-off-by: Sergey Borovoy <48699431+sergeyborovoy@users.noreply.github.com>

* Update content/en/multitenancy.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
Signed-off-by: Sergey Borovoy <48699431+sergeyborovoy@users.noreply.github.com>

* Update content/en/multitenancy.md

Signed-off-by: Jihoon Seo <46767780+jihoon-seo@users.noreply.github.com>

Signed-off-by: Sergey Borovoy <48699431+sergeyborovoy@users.noreply.github.com>
Signed-off-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
Signed-off-by: Jihoon Seo <46767780+jihoon-seo@users.noreply.github.com>
Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
Co-authored-by: Jihoon Seo <46767780+jihoon-seo@users.noreply.github.com>
@bconfiden2 @jihoon-seo @seokho-son
[ko] Translate 'Distributed Apps' in Korean (#1285)
f3bf0eb 
* [ko] Translate 'Distributed Apps' in Korean


Signed-off-by: bconfiden2 <bconfiden2@naver.com>
Signed-off-by: Seokho Son <shsongist@gmail.com>
Signed-off-by: Jihoon Seo <46767780+jihoon-seo@users.noreply.github.com>

Co-authored-by: Jihoon Seo <46767780+jihoon-seo@users.noreply.github.com>
Co-authored-by: Seokho Son <shsongist@gmail.com>
@CathPag @seokho-son @iamNoah1
Kubernetes edits + open questions (#1298)
2b012fb 
* Kubernetes edits + open questions 

Signed-off-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

* Update content/en/kubernetes.md

Co-authored-by: Seokho Son <shsongist@gmail.com>
Signed-off-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

* Update content/en/kubernetes.md

Co-authored-by: Seokho Son <shsongist@gmail.com>
Signed-off-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

* Update content/en/kubernetes.md

Co-authored-by: Seokho Son <shsongist@gmail.com>
Signed-off-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

* Update content/en/kubernetes.md

Co-authored-by: Seokho Son <shsongist@gmail.com>
Signed-off-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

* Update kubernetes.md

Signed-off-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

* Update content/en/kubernetes.md

Co-authored-by: Seokho Son <shsongist@gmail.com>
Signed-off-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>

Signed-off-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
Signed-off-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>
Co-authored-by: Seokho Son <shsongist@gmail.com>
Co-authored-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>
@seokho-son
Merge pull request #1290 from cncf/dev-ko
6299a28 
Merge dev-ko into main (for Korean localization live version)
@dependabot
chore(deps): bump rojopolis/spellcheck-github-actions
e8a9591 
Bumps [rojopolis/spellcheck-github-actions](https://github.com/rojopolis/spellcheck-github-actions) from 0.26.0 to 0.27.0.
- [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.26.0...0.27.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
@seokho-son
Merge pull request #1307 from cncf/dependabot/github_actions/rojopoli…
2fc934e 
…s/spellcheck-github-actions-0.27.0

chore(deps): bump rojopolis/spellcheck-github-actions from 0.26.0 to 0.27.0
@CathPag
Multi tenancy completed
bb7f94f 
We forgot to update the status. This term is ready :) 

Signed-off-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
@seokho-son
Merge pull request #1311 from cncf/CathPag-patch-2
417cc18 
Multi tenancy completed
@KiranSatyaRaj @iamNoah1 @CathPag
Add service models and modify documentation (#1270)
1e62098 
* Add service models and modify documentation

adding primary service models to the documentation and modifying it for a better understanding and readability.

Signed-off-by: Kiran Satya Raj <90622705+KiranSatyaRaj@users.noreply.github.com>

* Update content/en/cloud-computing.md

Signed-off-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>

* Update content/en/cloud-computing.md

Signed-off-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>

* Some edits

Signed-off-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Kiran Satya Raj <90622705+KiranSatyaRaj@users.noreply.github.com>
Signed-off-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>
Signed-off-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
Co-authored-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>
Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
@seokho-son @bconfiden2 @jihoon-seo
Translate abstraction.md into Korean (#1276)
cecd0c5 
Co-authored-by: bconfiden2 <bconfiden2@naver.com>
Co-authored-by: Jihoon Seo <46767780+jihoon-seo@users.noreply.github.com>
Signed-off-by: Seokho Son <shsongist@gmail.com>
@seokho-son
Merge pull request #1312 from cncf/main
59d4c91 
Update dev-ko branch by merging main branch
@electrocucaracha
Update headers and links (#1278)
2b04b55 
* [es] Rename canary deployment file
* [es] Fix template headers
* [es] Update word list
Signed-off-by: Victor Morales <chipahuac@hotmail.com>
@seokho-son @yunkon-kim
Enable labeler workflow (#1286)
54f6ab0 
* Re-enable labeler workflow

Signed-off-by: Seokho Son <shsongist@gmail.com>

* limit action targets .github/workflows/labeler.yml

Co-authored-by: Yunkon Kim  <7975459+yunkon-kim@users.noreply.github.com>
Signed-off-by: Seokho Son <shsongist@gmail.com>

* Add main .github/workflows/labeler.yml

Signed-off-by: Seokho Son <shsongist@gmail.com>

Signed-off-by: Seokho Son <shsongist@gmail.com>
Co-authored-by: Yunkon Kim  <7975459+yunkon-kim@users.noreply.github.com>
@iamNoah1
add check if the term has already been declined in the past
ad4d4f9
@lunarwhite
docs: add missing url prefix
1dacc43 
Signed-off-by: Yuedong Wu <57584831+lunarwhite@users.noreply.github.com>
@lunarwhite
docs: add missing url prefix
c243937 
Signed-off-by: Yuedong Wu <57584831+lunarwhite@users.noreply.github.com>
@seokho-son
Merge pull request #1317 from iamNoah1/add-already-declined-check
6c8e125 
add check if the term has already been declined in the past
@lunarwhite
docs: fix terminology description (#1319)
7afa3b7 
Signed-off-by: Yuedong Wu <57584831+lunarwhite@users.noreply.github.com>

Signed-off-by: Yuedong Wu <57584831+lunarwhite@users.noreply.github.com>
@shivaabhishek07
Copy link
Author

Hope everything is done!

@shivaabhishek07 shivaabhishek07 mentioned this pull request Feb 5, 2023
Closed
11 tasks
@jihoon-seo
Copy link
Collaborator

@shivaabhishek07 Thank you for your contribution, but this is not an appropriate approach.
Instead, we need to open a PR that merges main branch (or its copied branch) into dev-hi.
Precisely, it means that we need to push the commits in main branch into dev-hi "as-is".

For this time, you (or any other contributor) can open the PR at the link dev-hi...main
by clicking the green "Create pull request" button.

@jihoon-seo jihoon-seo added lang/hi for Hindi hold Wait, please do not proceed this yet labels Feb 5, 2023
@shivaabhishek07
Copy link
Author

@jihoon-seo How about now?

jihoon-seo
jihoon-seo approved these changes Feb 6, 2023
View reviewed changes
Copy link
Collaborator

@jihoon-seo jihoon-seo left a comment

Choose a reason for hiding this comment

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

Now LGTM!

@jihoon-seo jihoon-seo added maintainers Use this label if PR requires maintainers to take action and removed hold Wait, please do not proceed this yet labels Feb 6, 2023
seokho-son
seokho-son approved these changes Feb 7, 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

Thanks @shivaabhishek07 ! :)

@seokho-son seokho-son merged commit 6bd1b22 into cncf:dev-hi Feb 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mitul3737 mitul3737 mitul3737 approved these changes

@jihoon-seo jihoon-seo jihoon-seo approved these changes

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

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

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

@JasonMorgan JasonMorgan Awaiting requested review from JasonMorgan

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

@Mouly22 Mouly22 Awaiting requested review from Mouly22

@ikramulkayes ikramulkayes Awaiting requested review from ikramulkayes

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

@DaveVentura DaveVentura Awaiting requested review from DaveVentura DaveVentura 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

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

@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

@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

@Eviekim Eviekim Awaiting requested review from Eviekim

@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

@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

@raelga raelga Awaiting requested review from raelga raelga 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

Assignees
No one assigned
Labels
lang/hi for Hindi maintainers Use this label if PR requires maintainers to take action
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.