Skip to content

Merge release-1.1 master#2086

Merged
hklai merged 5 commits intoistio:masterfrom
hklai:1.1-master
Jan 22, 2019
Merged

Merge release-1.1 master#2086
hklai merged 5 commits intoistio:masterfrom
hklai:1.1-master

Conversation

@hklai
Copy link
Contributor

@hklai hklai commented Jan 22, 2019

No description provided.

JimmyCYJ and others added 5 commits January 15, 2019 11:39
@JimmyCYJ @istio-testing
Removes dangling pointer in capture list of lambda function. (istio#2080
702ee43 
)

* Replace this with members in capture list.

* update

* fix format
@JimmyCYJ @istio-testing
Use shared_ptr to protect members which are passed to capture list of…
065e0dd 
… lambda function. (istio#2083)

* fix bug

* introduce ControlData

* fix format

* update

* fix format

* Revise

* Pass ControlDataSharedPtr into Control and hold ref

* pass JwtAuthenticationConstSharedPtr into JwtAuthStore to hold ref

* Revise
@PiotrSikora @istio-testing
Update Envoy SHA to latest with protobuf.Any configs (release-1.1). (i…
d2d0c62 
…stio#2082)

* Update Envoy SHA to latest with protobuf.Any configs (release-1.1).

For istio/istio#10993.

Signed-off-by: Piotr Sikora <piotrsikora@google.com>

* review: don't open /dev/stdout in tests.

Signed-off-by: Piotr Sikora <piotrsikora@google.com>
@yangminzhu @istio-testing
Update Istio API to latest (1.1 branch) (istio#2084)
cc6dc4a 
Signed-off-by: Yangmin Zhu <ymzhu@google.com>
@hklai
Merge remote-tracking branch 'upstream/release-1.1' into 1.1-master
545d6e9
@googlebot
Copy link
Collaborator

googlebot commented Jan 22, 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 22, 2019
@istio-testing
Copy link
Collaborator

istio-testing commented Jan 22, 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

@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 22, 2019
@googlebot
Copy link
Collaborator

googlebot commented Jan 22, 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 merged commit 05a1534 into istio:master Jan 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

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.

6 participants

@hklai @googlebot @istio-testing @JimmyCYJ @PiotrSikora @yangminzhu