Revert squash #21
Merged
Revert squash #21
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: DazWilkin <daz.wilkin@gmail.com>
Signed-off-by: Shikugawa <Shikugawa@gmail.com> Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Gregory Brail <gregbrail@google.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
…ts#7) Signed-off-by: Yaroslav Skopets <yaroslav@tetrate.io>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
While there, align style with the test framework. Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Fixes yskopets#4. Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
While there, update Bazel to 3.7.0. Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Svetlin Zarev <svetlin.zarev@sap.com>
Fixes yskopets#6. Signed-off-by: Daniel Grimm <dgrimm@redhat.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Takaya Saeki <takaya@tetrate.io>
Signed-off-by: Takaya Saeki <takaya@tetrate.io>
Signed-off-by: Takaya Saeki <takaya@tetrate.io>
Signed-off-by: Takaya Saeki <takaya@tetrate.io>
Signed-off-by: Takaya Saeki <takaya@tetrate.io>
Signed-off-by: Takaya Saeki <takaya@tetrate.io>
Signed-off-by: Takaya Saeki <takaya@tetrate.io>
Signed-off-by: Takaya Saeki <takaya@tetrate.io>
Signed-off-by: Takaya Saeki <takaya@tetrate.io>
Signed-off-by: Takaya Saeki <takaya@tetrate.io>
Signed-off-by: Takaya Saeki <takaya@tetrate.io>
….17 (yskopets#19)" This reverts commit 861b33b.
This was referenced Apr 20, 2021
yskopets
approved these changes
Apr 21, 2021
github-actions bot
pushed a commit
that referenced
this pull request
Apr 22, 2021
Revert squash Signed-off-by: Takaya Saeki <takaya@tetrate.io>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Because #19 was merged by squash-merge, all updates from the upstream have been merged to our fork of
proxy-wasm-rust-sdkas a independent commit. This has made any further merge attempts from upstream incur conflict, which makes practically impossible to make this fork update to the upstream. Let's redo the merge of #19 with regular merge instead of squash merge.