Skip to content

Merge release-1.1 into master#750

Merged
hklai merged 12 commits intoistio:masterfrom
hklai:1.1-master
Jan 9, 2019
Merged

Merge release-1.1 into master#750
hklai merged 12 commits intoistio:masterfrom
hklai:1.1-master

Conversation

@hklai
Copy link
Copy Markdown
Contributor

@hklai hklai commented Jan 9, 2019

No description provided.

quanjielin and others added 12 commits December 11, 2018 14:05
@quanjielin @istio-testing
add enable_sds_k8s_sa_jwt flag to meshconfig (istio#729)
b197843 
* add enable_sds_k8s_sa_jwt flag to meshconfig

* fix build

* update comment and rename
@frankbu @rshriram
Fix broken CORS link (istio#728)
0a85c2c
@bianpengyuan @mandarjog
oop adapter connection auth config (istio#606)
80aff01 
* grpc adapter connection auth.

* proto.lock.
@geeknoid
Fix a comment. (istio#740)
6c1f299
Comment typo fixes.
ac180ae
@hzxuzhonghu @rshriram
Add per service locality weight setting (istio#726)
08a19da 
* Add locality weight setting

* generate

* Add locality weight setting

* generate

* Add locality weight setting

* make proto commit
@vadimeisenbergibm @rshriram
remove deprecated from OutboundTrafficPolicy. REGISTRY_ONLY and ALLOW…
ab6f375 
…_ALL (istio#744)

* add allow_traffic_to_unknown_ports flag to meshconfig

related to istio/istio#10330

* update proto.lock

* Revert "update proto.lock"

This reverts commit d1d3a02.

* Revert "add allow_traffic_to_unknown_ports flag to meshconfig"

This reverts commit e6fd415.

* remove deprecated from OutboundTrafficPolicy. REGISTRY_ONLY and ALLOW_ALL

* remove deprecated from Mode and outbound_traffic_policy
@bianpengyuan @istio-testing
Add Mixer Report Session Affinity into Mesh Config (istio#746)
4238d2d 
* add session affinity option.

* proto lock
@bianpengyuan @rshriram
rename report_session_affinity. (istio#747)
d793e6c
@JoeWrightss @istio-testing
Fix some spelling errors (istio#745)
30cc0ae 
Signed-off-by: JoeWrightss <[email protected]>
@rshriram @istio-testing
Sidecar config resource (istio#742)
448faa9 
* renaming

Signed-off-by: Shriram Rajagopalan <[email protected]>

* Sidecar

Signed-off-by: Shriram Rajagopalan <[email protected]>

* gateway updates

Signed-off-by: Shriram Rajagopalan <[email protected]>

* tweaks

Signed-off-by: Shriram Rajagopalan <[email protected]>

* update protolock

Signed-off-by: Shriram Rajagopalan <[email protected]>

* add workloadSelector to EnvoyFilter

Signed-off-by: Shriram Rajagopalan <[email protected]>

* update comments

Signed-off-by: Shriram Rajagopalan <[email protected]>

* feedback

* tweaks

Signed-off-by: Shriram Rajagopalan <[email protected]>

* capture mode

Signed-off-by: Shriram Rajagopalan <[email protected]>

* nits

Signed-off-by: Shriram Rajagopalan <[email protected]>
@hklai
Merge release-1.1 into master
a999ccd
@istio-testing
Copy link
Copy Markdown
Collaborator

istio-testing commented Jan 9, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hklai

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:

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
Copy Markdown
Collaborator

googlebot commented Jan 9, 2019

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 Jan 9, 2019
@hklai hklai added cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. and removed cla: no Set by the Google CLA bot to indicate the author of a PR has not signed the Google CLA. labels Jan 9, 2019
@googlebot
Copy link
Copy Markdown
Collaborator

googlebot commented Jan 9, 2019

A Googler has manually verified that the CLAs look good.

(Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.)

@hklai hklai requested a review from geeknoid January 9, 2019 00:22
@hklai hklai merged commit 5762965 into istio:master Jan 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kyessenov kyessenov Awaiting requested review from kyessenov

@douglas-reid douglas-reid Awaiting requested review from douglas-reid

@mandarjog mandarjog Awaiting requested review from mandarjog

@geeknoid geeknoid Awaiting requested review from geeknoid

1 more reviewer

@rshriram rshriram rshriram approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.