Skip to content

Merge release-1.1 to master#699

Merged
rshriram merged 15 commits intoistio:masterfrom
rshriram:r11tom
Nov 8, 2018
Merged

Merge release-1.1 to master#699
rshriram merged 15 commits intoistio:masterfrom
rshriram:r11tom

Conversation

@rshriram
Copy link
Copy Markdown
Member

@rshriram rshriram commented Nov 8, 2018

No description provided.

ymesika and others added 11 commits October 21, 2018 10:58
@ymesika @rshriram
Cherry picked network config (istio#667)
0ca0781 
* Updating description of network definitions (istio#664)

* clarity

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* renaming

* nits

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* Added MeshNetworks
@rshriram
Merge branch 'release-1.1' into release-1.1
e7646ba
@rshriram
Merge pull request istio#676 from rshriram/release-1.1
0fc221c 
Cherry pick PRs from master
@hzxuzhonghu @rshriram
Add HTTPRetry config to allow setting retryOn policy (istio#679)
e9d86f9
@ymesika @rshriram
Minor correction to avoid confusion in ServiceEntry reference doc (is…
5b71098 
…tio#678)

* Minor correction to avoid confusion in reference doc

* Updated also the pb and html
@hzxuzhonghu @istio-testing
use lowercase_with_underscore for field name retry_on (istio#681)
ff7edaf
@GregHanson @rshriram
re-add deprecated fields, but hide from docs. also resurrect outbound…
7ce9562 
… traffic policy config (istio#680)
@jeffmendoza @rshriram
Fix style for TLS enum in networking. (istio#690)
20d2d5d 
* Fix style for TLS enum in networking.

* Regen with new networking proto.
@hzxuzhonghu @istio-testing
update commentttttt (istio#695)
510451b
@kyessenov @istio-testing
documentation (istio#698)
d782dca 
Signed-off-by: Kuat Yessenov <kuat@google.com>
Merge remote-tracking branch 'origin/release-1.1' into r11tom
072d625
@googlebot
Copy link
Copy Markdown
Collaborator

googlebot commented Nov 8, 2018

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 Nov 8, 2018
@hklai
Copy link
Copy Markdown
Contributor

hklai commented Nov 8, 2018

/lgtm

/hold
Will do a manual commit merge after all tests have passed.

@istio-testing istio-testing added do-not-merge/hold Block automatic merging of a PR. lgtm labels Nov 8, 2018
costinm
costinm approved these changes Nov 8, 2018
View reviewed changes
Copy link
Copy Markdown
Contributor

@costinm costinm left a comment

Choose a reason for hiding this comment

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

/lgtm

@istio-testing
Copy link
Copy Markdown
Collaborator

istio-testing commented Nov 8, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: costinm, hklai, rshriram

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

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [costinm,hklai,rshriram]

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

@rshriram rshriram merged commit 7b94541 into istio:master Nov 8, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@costinm costinm costinm approved these changes

@mandarjog mandarjog Awaiting requested review from mandarjog

@sebastienvas sebastienvas Awaiting requested review from sebastienvas

Assignees

@costinm costinm

@hklai hklai

Labels

cla: no Set by the Google CLA bot to indicate the author of a PR has not signed the Google CLA. do-not-merge/hold Block automatic merging of a PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.