Skip to content

fix conflicted#2101

Merged
istio-testing merged 2 commits intoistio:sds_apifrom
quanjielin:quanlinfix0131
Jan 31, 2019
Merged

fix conflicted#2101
istio-testing merged 2 commits intoistio:sds_apifrom
quanjielin:quanlinfix0131

Conversation

@quanjielin
Copy link
Contributor

some unmerged from yesterday's #2099

@googlebot googlebot added the cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. label Jan 31, 2019
@quanjielin quanjielin requested review from JimmyCYJ and removed request for lizan and rshriram January 31, 2019 18:56
@quanjielin quanjielin force-pushed the quanlinfix0131 branch 2 times, most recently from 9cd15f4 to b9028b6 Compare January 31, 2019 19:53
#
# Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/COMMIT.tar.gz && sha256sum COMMIT.tar.gz`
ENVOY_SHA = "b3be5713f2100ab5c40316e73ce34581245bd26a"
ENVOY_SHA256 = "79629284ae143d66b873c08883dc6382fac2e8ed45f6f3521f7e7282b6650216"
Copy link
Contributor

Choose a reason for hiding this comment

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

Don't remove sha256 here and below? You don't need to change this file actually

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was comment out before but I accidentally revert it in #2099, I think the reason of removing sha256 in this repo because it's only for our testing(by updating the envoy_sha with a local build like https://github.com/istio/envoy/tree/sds_request_debug).
@JimmyCYJ could give more context.

Copy link
Member

Choose a reason for hiding this comment

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

This sds_api branch was used to demo and test SDS when Envoy SDS work was under review. @quanjielin is going to use this branch for debugging and testing sds integration with istio.

Copy link
Contributor

Choose a reason for hiding this comment

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

ah ok I thought this is release branch or master.

@JimmyCYJ
Copy link
Member

/lgtm

@istio-testing
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JimmyCYJ, quanjielin

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

@istio-testing istio-testing merged commit c487904 into istio:sds_api Jan 31, 2019
@quanjielin quanjielin deleted the quanlinfix0131 branch January 31, 2019 21:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants