Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.5] [libbeat] Temporarily vendor sarama from elastic's fork #14729

Merged
merged 4 commits into from
Nov 25, 2019
Merged

[7.5] [libbeat] Temporarily vendor sarama from elastic's fork #14729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5cd1ff
Remove mainline vendored sarama
faec Nov 24, 2019
ca57621
Re-vendor sarama from elastic's fork with the azure fix
faec Nov 24, 2019
f59b895
fix stray rootPath
faec Nov 24, 2019
1ae02a1
Update notice
jsoriano Nov 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4863,8 +4863,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------
Dependency: github.com/Shopify/sarama
Version: v1.23.1
Revision: 46c83074a05474240f9620fb7c70fb0d80ca401a
Version: v1.23.1-elastic
Revision: 71dcfe72351b8daf910276a46540ca0b7bbe0a2b
License type (autodetected): MIT
./vendor/github.com/Shopify/sarama/LICENSE:
--------------------------------------------------------------------
Expand Down
17 changes: 17 additions & 0 deletions vendor/github.com/Shopify/sarama/broker.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions vendor/github.com/Shopify/sarama/dev.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions vendor/vendor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,14 @@
"revisionTime": "2018-07-23T16:30:02Z"
},
{
"checksumSHA1": "w5NkRQ2Cebz7a6UfrbwFdhyRWnM=",
"checksumSHA1": "qrdmO04N/Fb0BvrohZecpjMbcU0=",
"origin": "github.com/elastic/sarama",
"path": "github.com/Shopify/sarama",
"revision": "46c83074a05474240f9620fb7c70fb0d80ca401a",
"revisionTime": "2019-07-22T18:01:16Z",
"revision": "71dcfe72351b8daf910276a46540ca0b7bbe0a2b",
"revisionTime": "2019-11-24T15:23:03Z",
"tree": true,
"version": "v1.23.1",
"versionExact": "v1.23.1"
"version": "v1.23.1-elastic",
"versionExact": "v1.23.1-elastic"
},
{
"checksumSHA1": "Te1xRugxHQMAg7EvbIUuPWm8fvU=",
Expand Down