Skip to content

Update Envoy SHA to point to same commit in istio/envoy:release-1.3#2372

Merged
istio-testing merged 1 commit intorelease-1.3from
update-envoy-repo-release-1.3
Aug 19, 2019
Merged

Update Envoy SHA to point to same commit in istio/envoy:release-1.3#2372
istio-testing merged 1 commit intorelease-1.3from
update-envoy-repo-release-1.3

Conversation

@rlenglet
Copy link
Copy Markdown
Contributor

This PR updates the Envoy SHA in istio/proxy:release-1.3 to refer to the istio:envoy:release-1.3 branch. The referred commit in unchanged, so it shouldn't have any functional effects.

All subsequent changes to the Envoy SHA must keep referring to commits in the istio:envoy:release-1.3 branch.

@rlenglet rlenglet added this to the 1.3 milestone Aug 19, 2019
@rlenglet rlenglet requested review from a team, PiotrSikora and duderino August 19, 2019 16:31
@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 Aug 19, 2019
@istio-testing istio-testing added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 19, 2019
@istio-testing istio-testing merged commit 58f1db6 into release-1.3 Aug 19, 2019
@delete-merged-branch delete-merged-branch bot deleted the update-envoy-repo-release-1.3 branch August 19, 2019 18:11
@PiotrSikora
Copy link
Copy Markdown
Contributor

What kind of shenanigans is this? This commit SHA doesn't point to istio/envoy:release-1.3.

@rlenglet
Copy link
Copy Markdown
Contributor Author

What kind of shenanigans is this? This commit SHA doesn't point to istio/envoy:release-1.3.

The history of istio/envoy:release-1.3 includes 3f90336c39250c472cfd51b157c305582b7a6725, due to my merge in istio/envoy#90.
Grep for 3f90336 on https://github.com/istio/envoy/commits/release-1.3.

@PiotrSikora
Copy link
Copy Markdown
Contributor

What kind of shenanigans is this? This commit SHA doesn't point to istio/envoy:release-1.3.

The history of istio/envoy:release-1.3 includes 3f90336c39250c472cfd51b157c305582b7a6725, due to my merge in istio/envoy#90.
Grep for 3f90336 on https://github.com/istio/envoy/commits/release-1.3.

Commit istio/envoy@3f90336 was MERGED into istio/envoy@release-1.3 branch, but it was never a commit ON the istio/envoy@release-1.3 branch.

Try:

$ git checkout release-1.3
$ cat CODEOWNERS
* @istio/release-managers-1-3
$ git checkout 3f90336c39250c472cfd51b157c305582b7a6725
$ cat CODEOWNERS
# TODO(zuercher): determine how we want to deal with auto-assignment
# By default, @envoyproxy/maintainers own everything.
#*       @envoyproxy/maintainers
...
(omitted rest of the output)

If you want to checkout commit istio/envoy@3f90336 in a istio/envoy@release-1.3 branch, then you need to checkout the merge commit, i.e. istio/envoy@ad234fe, or one of the child commits:

$ git checkout ad234fe02c153a8523c95de6d8748a95b023fbe5
$ cat CODEOWNERS
* @istio/release-managers-1-3

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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants