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

Cherry-pick latest changes from master #2204

Merged
merged 32 commits into from
Aug 10, 2018
Merged

Cherry-pick latest changes from master #2204

merged 32 commits into from
Aug 10, 2018

Conversation

geeknoid
Copy link
Contributor

No description provided.

trainyao and others added 30 commits August 10, 2018 07:34
@trainyao
translate /help/glossary/ page (#2163)
e36ebf3 
* translate /help/glossary/ page

* add period to description

(cherry picked from commit f6628e4)
@kelvinji2009
Translate to chinese: content/help/faq/_index.md #189 (#2165)
70b7b7e 
(cherry picked from commit eb680ee)
@kelvinji2009
Translate to chinese: content/help/faq (#2166)
52701c0 
* Translate to chinese: content/help/faq/_index.md #189

* Translate to chinese: content/help/faq/setup/index.md #224

* Translate to chinese: content/help/faq/setup/consul-app-not-working.md #222

* Translate to chinese: content/help/faq/setup/k8s-sidecar-injection-not-working.md #226

* improve format

* Translate to chinese: content/help/faq/setup/consul-unset-context.md #223

* fix lint error: spell check

* Translate to chinese: content/help/faq/setup/k8s-migrating.md #225

* improve format

* improve format

* improve format

(cherry picked from commit 0e88c05)
@DavadDi
Translate Istio 1.0 canary into Chinese (#2167)
72b9581 
(cherry picked from commit 7821bd9)
@trainyao
translate /help/glossary/#attribute (#2164)
5076c7b 
* translate /help/glossary/#attribute /help/glossary/#workload

* commit one file in a time, for passing ci

(cherry picked from commit 070f298)
@Mr-Linus
Translate into Chinese: Multiple files Sync/update (#2156)
732b7ce 
* Translate into Chinese: blog/2017/0.2-announcement/index.md

* Update index.md

* Update _index.md

* Translate into Chinese: Multiple files

* Update index.md

* Update index.md

(cherry picked from commit 55fcce6)
@DavadDi
Translate Istio 1.0 canary into Chinese (#2170)
e8685c5 
(cherry picked from commit 399c685)
@fuxu
Translate installation options (#2157)
0fa29be 
(cherry picked from commit b9fc21a)
@trainyao
translate /help/glossary/#adapter (#2171)
eccb552 
* translate /help/glossary/#adapter

* add pauses between chinese words (#2171)

(cherry picked from commit 663d240)
@geeknoid
Fix up some aliases. (#2174)
cf38b90 
(cherry picked from commit be92dc7)
@DavadDi
fix auth lint issues (#2179)
a19b191 
(cherry picked from commit d8eec80)
@trainyao
translate /help/glossary/#micro-segmentation (#2183)
346165a 
(cherry picked from commit 75267fc)
@wattli
Revise the health check faq (#2175)
a9d6901 
(cherry picked from commit 9b9f7b2)
@osswangxining
add alicloud (#2125)
d26d40f 
(cherry picked from commit 1303ef3)
@imgbot
[ImgBot] optimizes images (#2186)
41ac0ea 
*Total -- 559.34kb -> 377.43kb (32.52%)

/content/docs/setup/kubernetes/platform-setup/alicloud/csconsole.png -- 375.59kb -> 251.11kb (33.14%)
/content/docs/setup/kubernetes/quick-start-alicloud-ack/app-catalog-istio-1.0.0.png -- 183.75kb -> 126.33kb (31.25%)

(cherry picked from commit c3e9a72)
A few editorial fixes.
34119dc 
(cherry picked from commit 3e3bffa)
@Mr-Linus
Translate into Chinese: Multiple files Sync & update (#2187)
e13ec62 
* Translate into Chinese: blog/2017/0.2-announcement/index.md

* Update index.md

* Update _index.md

* Translate into Chinese: Multiple files

* Update index.md

* Update index.md

* Sync

* Sync

* Sync/Update

* Sync/Update

* Sync

* Fix no space problem.

(cherry picked from commit 714a335)
@trainyao
translate /help/glossary/#mutual-tls (#2178)
0941705 
(cherry picked from commit a7d4a48)
@xionchen
translate content/help/ops/security/_index.md (#2188)
cfe39ec 
(cherry picked from commit 65cdf96)
@DavadDi
Translate help/ops/traffic-management into Chinese (#2184)
d6d09fe 
(cherry picked from commit a2901dd)
@wattli
Revise the health check faq (#2191)
355ba99 
* Revise the health check faq

* Fix format

* Fix format

(cherry picked from commit 481e58c)
@jmazzitelli
Update index.md (#2190)
86cbdac 
indicate "app" label is also used for metric telemetry, not just distributed tracing.

(cherry picked from commit d52bf01)
@trainyao
translate /help/glossary/#workload (#2172)
8c8409c 
* translate /help/glossary/#workload

* try fix chinese archoar (#2172)

(cherry picked from commit 332514a)
@Mr-Linus
Update Terms (#2189)
63f7b2e 
(cherry picked from commit 83efe7d)
fix typo (#2192)
610eb16 
(cherry picked from commit 9961b52)
add IKS-ICP hybrid multicluster example (#2169)
f153872 
(cherry picked from commit 65a1638)
@geeknoid
Couple FAQ fixes (#2195)
96993ef 
(cherry picked from commit f8f6491)
Translate reference istioctl (#2182)
f34a27a 
* Translate: reference/istioctl/

* spell checking.

* ci

* re-lint

* accept comments

(cherry picked from commit 3e25501)
@trainyao
translate /help/glossary/#mixer-instance /help/glossary/#mixer-handler (
d5bc149 
#2194)

* translate /help/glossary/#mixer-instance /help/glossary/#mixer-handler

* preserve `handler``instance` word

(cherry picked from commit e0b8c6f)
@trainyao
Trans help glossary mixer and more (#2197)
0702916 
* translate /help/glossary/#envoy #mixer #service-endpoint #service-mesh #service-name #service-version #service #workload-instance-principal #workload-instance

* fix typo

(cherry picked from commit 93864e8)
Whitilied and others added 2 commits August 10, 2018 07:40
@Whitilied
fix typesetting error (#2200)
4b713b6 
(cherry picked from commit f9571e6)
@fikriauliya
Remove misplaced "the" (#2198)
cf4f471 
(cherry picked from commit 6c4b750)
@istio-testing
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: geeknoid

If they are not already assigned, you can assign the PR to them by writing /assign @geeknoid in a comment when ready.

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

@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of all the commit author(s), set the cla label to yes (if enabled on your project), and then merge this pull request when appropriate.

@googlebot googlebot added the cla: no Set by the Google CLA bot to indicate the author of a PR has not signed the Google CLA. label Aug 10, 2018
@geeknoid geeknoid merged commit 217315e into istio:release-1.0 Aug 10, 2018
charili pushed a commit to charili/istio.io that referenced this pull request Nov 10, 2019
@geeknoid
Cherry-pick latest changes from master (istio#2204)
a54eb06 
* translate /help/glossary/ page (istio#2163)

* translate /help/glossary/ page

* add period to description

(cherry picked from commit f6628e4)

* Translate to chinese: content/help/faq/_index.md istio#189 (istio#2165)

(cherry picked from commit eb680ee)

* Translate to chinese: content/help/faq (istio#2166)

* Translate to chinese: content/help/faq/_index.md istio#189

* Translate to chinese: content/help/faq/setup/index.md istio#224

* Translate to chinese: content/help/faq/setup/consul-app-not-working.md istio#222

* Translate to chinese: content/help/faq/setup/k8s-sidecar-injection-not-working.md istio#226

* improve format

* Translate to chinese: content/help/faq/setup/consul-unset-context.md istio#223

* fix lint error: spell check

* Translate to chinese: content/help/faq/setup/k8s-migrating.md istio#225

* improve format

* improve format

* improve format

(cherry picked from commit 0e88c05)

* Translate Istio 1.0 canary into Chinese (istio#2167)

(cherry picked from commit 7821bd9)

* translate /help/glossary/#attribute (istio#2164)

* translate /help/glossary/#attribute /help/glossary/#workload

* commit one file in a time, for passing ci

(cherry picked from commit 070f298)

* Translate into Chinese: Multiple files Sync/update (istio#2156)

* Translate into Chinese: blog/2017/0.2-announcement/index.md

* Update index.md

* Update _index.md

* Translate into Chinese: Multiple files

* Update index.md

* Update index.md

(cherry picked from commit 55fcce6)

* Translate Istio 1.0 canary into Chinese (istio#2170)

(cherry picked from commit 399c685)

* Translate installation options (istio#2157)

(cherry picked from commit b9fc21a)

* translate /help/glossary/#adapter (istio#2171)

* translate /help/glossary/#adapter

* add pauses between chinese words (istio#2171)

(cherry picked from commit 663d240)

* Fix up some aliases. (istio#2174)

(cherry picked from commit be92dc7)

* fix auth lint issues (istio#2179)

(cherry picked from commit d8eec80)

* translate /help/glossary/#micro-segmentation (istio#2183)

(cherry picked from commit 75267fc)

* Revise the health check faq (istio#2175)

(cherry picked from commit 9b9f7b2)

* add alicloud (istio#2125)

(cherry picked from commit 1303ef3)

* [ImgBot] optimizes images (istio#2186)

*Total -- 559.34kb -> 377.43kb (32.52%)

/content/docs/setup/kubernetes/platform-setup/alicloud/csconsole.png -- 375.59kb -> 251.11kb (33.14%)
/content/docs/setup/kubernetes/quick-start-alicloud-ack/app-catalog-istio-1.0.0.png -- 183.75kb -> 126.33kb (31.25%)

(cherry picked from commit c3e9a72)

* A few editorial fixes.

(cherry picked from commit 3e3bffa)

* Translate into Chinese: Multiple files  Sync & update (istio#2187)

* Translate into Chinese: blog/2017/0.2-announcement/index.md

* Update index.md

* Update _index.md

* Translate into Chinese: Multiple files

* Update index.md

* Update index.md

* Sync

* Sync

* Sync/Update

* Sync/Update

* Sync

* Fix no space problem.

(cherry picked from commit 714a335)

* translate /help/glossary/#mutual-tls (istio#2178)

(cherry picked from commit a7d4a48)

* translate content/help/ops/security/_index.md (istio#2188)

(cherry picked from commit 65cdf96)

* Translate help/ops/traffic-management into Chinese (istio#2184)

(cherry picked from commit a2901dd)

* Revise the health check faq (istio#2191)

* Revise the health check faq

* Fix format

* Fix format

(cherry picked from commit 481e58c)

* Update index.md (istio#2190)

indicate "app" label is also used for metric telemetry, not just distributed tracing.

(cherry picked from commit d52bf01)

* translate /help/glossary/#workload (istio#2172)

* translate /help/glossary/#workload

* try fix chinese archoar (istio#2172)

(cherry picked from commit 332514a)

* Update Terms (istio#2189)

(cherry picked from commit 83efe7d)

* fix typo (istio#2192)

(cherry picked from commit 9961b52)

* add IKS-ICP hybrid multicluster example (istio#2169)

(cherry picked from commit 65a1638)

* Couple FAQ fixes (istio#2195)

(cherry picked from commit f8f6491)

* Translate reference istioctl (istio#2182)

* Translate: reference/istioctl/

* spell checking.

* ci

* re-lint

* accept comments

(cherry picked from commit 3e25501)

* translate /help/glossary/#mixer-instance /help/glossary/#mixer-handler (istio#2194)

* translate /help/glossary/#mixer-instance /help/glossary/#mixer-handler

* preserve `handler``instance` word

(cherry picked from commit e0b8c6f)

* Trans help glossary mixer and more (istio#2197)

* translate /help/glossary/#envoy #mixer #service-endpoint #service-mesh #service-name #service-version #service #workload-instance-principal #workload-instance

* fix typo

(cherry picked from commit 93864e8)

* fix typesetting error (istio#2200)

(cherry picked from commit f9571e6)

* Remove misplaced "the" (istio#2198)

(cherry picked from commit 6c4b750)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fleeto fleeto Awaiting requested review from fleeto

@frankbu frankbu Awaiting requested review from frankbu

@linsun linsun Awaiting requested review from linsun

Assignees
No one assigned
Labels
cla: no Set by the Google CLA bot to indicate the author of a PR has not signed the Google CLA.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet