Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

logging: Add containerID and sandboxID to all log calls #453

Merged
merged 1 commit into from
Jun 29, 2018

Conversation

jodh-intel
Copy link
Contributor

Adding cid+sid fields to the log entries generated by most of the CLI
commands will make debugging across the system easier.

Fixes #452.

Signed-off-by: James O. D. Hunt [email protected]

Adding cid+sid fields to the log entries generated by most of the CLI
commands will make debugging across the system easier.

Fixes kata-containers#452.

Signed-off-by: James O. D. Hunt <[email protected]>
@grahamwhaley
Copy link
Contributor

kicked CI rebuilds - looked like network/remote access issues to get keys...

Copy link
Contributor

@grahamwhaley grahamwhaley left a comment

Choose a reason for hiding this comment

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

lgtm.
Thanks for doing this. I'm hoping it will really help my debugging :-)

@katacontainersbot
Copy link
Contributor

PSS Measurement:
Qemu: 144538 KB
Proxy: 4726 KB
Shim: 8914 KB

Memory inside container:
Total Memory: 2045968 KB
Free Memory: 2007236 KB

@codecov
Copy link

codecov bot commented Jun 28, 2018

Codecov Report

Merging #453 into master will increase coverage by 0.14%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #453      +/-   ##
==========================================
+ Coverage   63.99%   64.13%   +0.14%     
==========================================
  Files          87       87              
  Lines        8801     8837      +36     
==========================================
+ Hits         5632     5668      +36     
  Misses       2564     2564              
  Partials      605      605
Impacted Files Coverage Δ
cli/create.go 79.76% <100%> (+0.36%) ⬆️
cli/events.go 31.95% <100%> (+2.92%) ⬆️
cli/delete.go 94.2% <100%> (+0.35%) ⬆️
cli/state.go 87.5% <100%> (+0.83%) ⬆️
cli/exec.go 88.76% <100%> (+0.52%) ⬆️
cli/update.go 96.29% <100%> (+0.14%) ⬆️
cli/kill.go 92.3% <100%> (+0.64%) ⬆️
cli/ps.go 73.33% <100%> (+4.1%) ⬆️
cli/pause.go 100% <100%> (ø) ⬆️
cli/start.go 100% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9377548...a3ce121. Read the comment docs.

@jcvenegas
Copy link
Member

lgtm

@jodh-intel
Copy link
Contributor Author

One more ack and we can get this landed... ;)

@amshinde amshinde merged commit b7e3997 into kata-containers:master Jun 29, 2018
jodh-intel added a commit to jodh-intel/runtimes that referenced this pull request Jul 4, 2018
Don't add the container ID as a log fields as it is already a field
(added on kata-containers#453).

Signed-off-by: James O. D. Hunt <[email protected]>
egernst pushed a commit that referenced this pull request Aug 21, 2018
Don't add the container ID as a log fields as it is already a field
(added on #453).

Signed-off-by: James O. D. Hunt <[email protected]>
egernst pushed a commit that referenced this pull request Aug 23, 2018
Don't add the container ID as a log fields as it is already a field
(added on #453).

Signed-off-by: James O. D. Hunt <[email protected]>
lifupan added a commit to lifupan/kata-runtime that referenced this pull request May 23, 2019
Shimv2 needs the latest containerd, gogo/protobuf and agent vendors,
Shortlog since last vendoring of github.com/gogo/protobuf:

746e99c merged in golang/protobuf commit aa810b61a9c79d51363740d207bb46cf8e620ed5 - proto: fix handling of required fields after multiple violations
    4f863fb merged in golang/protobuf commit 89a0c16f4dc2a70c0ed864d8ef64878f24fdaa51 - README.md: remove usage of group in example
    2f3f4c2 merged in golang/protobuf commit 7d1b268556d691919f2262240737157830eab632 - jsonpb: avoid unexported fields in hand-crafted message (kata-containers#526)
    f2db49f merged in golang/protobuf commit f5983d50c82d70eaa88c17080245cc871558081f - proto: make invalid UTF-8 errors non-fatal (kata-containers#525)
    7aa71d7 merged in golang/protobuf commit 560bdb64431cc123098c2db67f16053a923a0688 - jsonpb: strictly document JSONPBMarshaler and JSONPBUnmarshaler behavior (kata-containers#524)
    eee5829 merged in golang/protobuf commit 93b26e6a70e37abb14f2f88194949312b0592a84 - protoc-gen-go: refactor generator by splitting up generateMessage
    ad62c6c part of golang's 427e165 commit. Missed removing this file with their test refactor
    efb8d72 merged in golang/protobuf commit 427e165155e0a4ff5993a36657c1f733f5b0f782 - proto: fix and cleanup test for deterministic marshal with custom marshalers
    7143b48 merged in golang/protobuf commit 14aad3d5ea4c323bcd7a2137e735da24a76e814c - jsonpb: avoid copying string-valued map-keys
    48e2601 merged in golang/protobuf commit 1325a051a2753cd67556b182843b1b693d0854cd -  proto: fix quadratic behavior in nested map marshaling (no size caching for stdduration/stdtime)
    bc71a26 merged in golang/protobuf commit f05648d464991ab1aa8cf6a499122c56f0f50f2f - jsonpb: handle map key and value properties properly
    be27d1b merged in golang/protobuf commit 9eb2c01ac278a5d89ce4b2be68fe4500955d8179 - jsonpb: decode int32/uint32/float32/float64 strings
    b43a52d merged in golang/protobuf commit 05f48f4eaf0e05663b562bab533cdd472238ce29 - proto: revert UTF-8 validation for proto2
    808c1f7 merged in golang/protobuf commit 64db29d85ff91ba669cfaf009d5f400a4da8a55f - jsonpb: error on scalar enum provided for repeated enums instead of panic
    07eab6a use only one write in the varint writer when possible (kata-containers#504)
    dd51cd8 fix typo independant to independent (kata-containers#512)
    211a54c Add godocs link to Readme.md (kata-containers#506)
    e87afe3 Fix text unmarshal for (u)int(8/16) fields (kata-containers#498)
    e5d5b02 Codegen for well-known types (kata-containers#489)
    6f222ca reorder some of the protoc paths in order to prefer our protobuf/google/protobuf/*.proto files. This is just to avoid using the wrong protos if you have the same protos in you gopath/src dir. (kata-containers#502)
    fd322a3 fix error: bad Go source code was generated, illegal hexadecimal number (kata-containers#488)
    61dbc13 Jsonpb custom type - kata-containers#411 (kata-containers#491)
    e14cafb Customtype  Warnings and issues  update (kata-containers#479)
    7c690ae Exact slice allocation for repeated packed varints (kata-containers#480)
    4aa4cc2 Adding missing func to CustomType documentation (kata-containers#483)
    5669497 bumped the go version (kata-containers#475)
    64d6d2f added nil check in Proto/Size methods fix kata-containers#444 (kata-containers#451)
    3e657e5 fix for letmegrpc (kata-containers#474)
    3cefc55 options to not generate xxx fields (kata-containers#467)
    4c0a09c updated to go1.11 and removed go1.9 (kata-containers#473)
    2b9e95f merged in golang/protobuf commit 70c277a8a150a8e069492e6600926300405c2884 - Fix unmarshaling JSON object with escaped string into Struct type. (kata-containers#464)
    2033462 merge in golang/protobuf commit 3a3da3a4e26776cc22a79ef46d5d58477532dede - proto: mention field name in error message (kata-containers#616) (kata-containers#465)
    98f6aa8 added license details to Readme.md (kata-containers#469)
    e66941c Update Readme.md (kata-containers#468)
    476a2e9 Set defaults on nonnullable fields (kata-containers#435) (kata-containers#459)
    5e81640 removed the GOPATH env dep in the makefile protopath (kata-containers#461)
    7af9d32 Fix nullable extension issues for non generated code (kata-containers#453)
    888d305 merge in golang/protobuf commit d7d60bc05d9f92d4692aa196ac022618c2d86655 - grpc: fix and improve interface comments for client/server types (kata-containers#604)
    a4350c5 merge in golang/protobuf commit 668a607657a5d387d6333648a2d9c749761fdc69 - LICENSE: Move title to README.md
    8599525 merged golang/protobuf commit 927b65914520a8b7d44f5c9057611cfec6b2e2d0 - proto: adjust documentation on RequiredNotSetError (kata-containers#603)
    8e3eb24 Fix wrong build tags (kata-containers#445)
    797fbbb merged commit 32a84b27e28ab9f681f0df16160c4ef1f6587094 from golang/pr… (kata-containers#446)
    baf2ea5  Added ProtoSize wrapper functions for the well known types  kata-containers#438 (kata-containers#443)
    5440baf exact slice allocation for fixed size packed fields (kata-containers#437)
    6eaa97b Added gRPC Course on Udemy (kata-containers#434)
    a4c2ffc Update Readme.md
    646de4d Fix typo (kata-containers#441)
    636bf03 fix kata-containers#427 consistent import naming between the import declaration and the vars in grpc
    7d68e88 fix build by regenerating everything
    fae8c2d fix git diff for travis
    2c42fe8 merged 7c4add53b497798e7fd7b204f28e41ab409bdbb7 from golang/protobuf. protoc-gen-go: remove deprecated function in grpc (kata-containers#426)
    ebc0565 merged 3fac2a27c94f99f4379551928df388fcb0ad37ce from golang/protobuf. ptypes: optimize Is to avoid prefix scan (kata-containers#425)
    37f19cd Handle deterministic marshaling for generated marshalers in XXX_Marshal
    67fcf76 Swap type assert and fix it (kata-containers#418)
    30cf7ac gofmt
    6b99319 travis: opt into apt get
    110e410 text: allow customtype to have a Bytes() method (kata-containers#227)
    99cb001 dev: amortize cost of growing a Buffer - merge fae8ec697c5d103f717d7fec21103cb5ec020bc8 from golang/protobuf
    1a0e3bd dev: proto: remove unused writeRaw function - merge d167f5cf056d2db6c0f53f44a3309ac60b99ab5b from golang/protobuf
    99bb9bf dev: Revert "protoc-gen-go: use standard library context (requires Go1.9) - merge bf2da8229df5077275b46b301818c6219ebe1003 from golang/protobuf
    9c8b44c dev: Implement "import public" using type aliases. - merge 6fb5325cf9e4b38b58cef6cd1f60c773cc2d5ad2 from golang/protobuf
    6487871 Expose vanity TurnOnGoRegistration (kata-containers#402)
    b8814cc dev: protoc-gen-go: fix generation of proxy getters for distant types - merge 9bb87600c289706cc58f76b46a91b05ddd2a44d8 from golang/protobuf
    9ddc509 dev: protoc-gen-go: fix up generation of package names - merge 3b4abe1a0672c5916c1937b8817dde8aeb579fe5 from golang/protobuf
    cbb7298 dev: protoc-gen-go: revert some API changes - merge 06c268a946d24fdcb0b59370c36ab876ece17556 from golang/protobuf
    8a67e47 dev: proto: do not allow unknown fields to satisfy required field bit - merge 91cccdb44a5fc8dfdf368e8b4d517a21de94dce9 from golang/protobuf
    265a302 dev: protoc-gen-go: Dont rely on local package name for mset name hack - merge 9c8fb7a95075eb047ab75e702de52f68ff360f17 from golang/protobuf
    00f8f1f dev: proto: ignore unknown fields in map entries - merge b028a76c61b7288aefe6746ab7b561d7eb15ab71 from golang/protobuf
    90d0c2a dev: conformance: remove useless variable declaration - merge conformance: remove useless variable declaration from golang/protobuf
    60491a7 dev: conformance: clean up, fix conformance tests - merge ab964bf603354327027b1974c2d1a199ce839899 from golang/protobuf
    9f8212a dev: protoc-gen-go: fix generation of public imports -merge 80c8f764516eebbf17174ea9fd61601d6a52f0f6 from golang/protobuf
    3860157 dev: Reduce a bunch of generated code in oneof sizers. - merge d0dc0def2e8a155b703a9b4966ca8f803ce06308 from golang/protobuf
    e41f35d protoc-gen-go: dont generate blank // import comment - merge b244a785444d0c500df2e0c6b968c05531365a00 from golang/protobuf
    6764c01 dev: golden_test: normalize path separators for Windows - merge 12a586e0adaf626e5d2f8da7881f321f076dbe2c from golang/protobuf
    e844e5c dev: protoc-gen-go: use standard library context (requires Go1.9) - merge 3dc8a89f965ba7bf716fd0d92b83c5da1792ab9c from golang/protobuf
    dfaf7a7 dev: protobuf: Delete makefiles, regenerate protos consistently - didnt merge everything, left Makefiles, but made the other small changes - merge 251359bf9d6712b0aefe759977c168b79d1f3a27 from golang/protobuf
    828b125 dev: protoc-gen-go: fix test - merge 2b3479d8d7175442fbfd46f4ba5c14d971aeb521 from golang/protobuf
    f5a1220 dev: protoc-gen-go: add paths=source_relative option - merge 6fb8a6f1c1f011b7fde2b40f72f46587180d8d25 from golang/protobuf
    214eb97 dev: fix golden tests for older protoc versions
    aa7e6f4 dev: protoc-gen-go: handle package import names per-file - merge 9d4962b4dc40a899c435fe1aaec48e683b4300ef from golang/protobuf
    08f8895 dev: protoc-gen-go: add test for various generation params - merge a1987161d42e479a8a593d7f66ff1be81574b1e0 from golang/protobuf
    d178c98 dev: protoc-gen-go: dont depend on input file ordering - merge f4733c73b342d1d1a07fda684e831f77f840a688 from golang/protobuf
    253b333 dev: protoc-gen-go: add more golden tests for imports - merge 15c34729da28f0a8c71325b8ee35ef19362290e6 from golang/protobuf
    100bcd0 dev: Rename generated Marshal and Unmarshal protobuf method - merge 60f8421f4063f411270d0527ca77697eb9f29f1e from golang/protobuf
    26c4e69 dev: protoc-gen-go: remove relative import in main_test.go - merge protoc-gen-go: remove relative import in main_test.go from golang/protobuf
    5f4a927 dev: protoc-gen-go: include canonical import comment - merge 1021ee9d478ac35478bd39859883102741f9c4c1 from golang/protobuf
    9c3ad97 dev: proto: avoid pointer arithmetic with invalidField - merge 649500c21ecd283d00f78859ac2f386df8ed2c96 from golang/protobuf
    e23e1bc dev: no more generated package doc - merge efae459c9350a60c1f8f503f34e3cb67f803a617 from golang/protobuf
    8b846a8 dev: Merge pull request kata-containers#520 from neild/dev.alias + Fix top-level Makefile to descend into protoc-gen-go. - merge 04869ad56b1a4eb4179ceadb8a1b787a9ce4b0a3, 8cbe6f4e7d1aa3a63d2ae35cf9e9eaa1aa4c6876, 025a21d09bcd80bade5d4d6c1fb7026dcf1056dd, f7e61e16d550efe3e664c64e8ef42b624b408643, 055d7b0dba6f8ba91c7e12e4f9cc891ba607f4e7, b322e49f0e384b8e162e1f55cdeedfbba461269c + 2c2f6de12273f767388d4f3aebf6306ae3a9c7cb from golang/protobuf
    2c90c88 upstream: add back proto.Sizer
    754b8fa dev: proto: treat bad wire types as unknown fields - merge e6af52bec88380a7a18ecc0977fa4312370a970b from golang/protobuf
    0091a58 dev: jsonpb: skip unexported or non-protobuf fields - merge 42d4f477264bec37ad9b729039d071eaedd32d9b from golang/protobuf
    504621d dev: protoc-gen-go: indicate deprecated fields in documentation - merge da3e23721ffb60cccccdef6dfaef948bce1ad9d7 from golang/protobuf
    5db6fbe dev: proto: support purego build tag - merge 9a84eb8532beb2edb9dfbd6a2d823e696b57b450 from golang/protobuf
    e1d2528 dev: proto: robustify tests that compare error messages - merge 57af8637f022e8bf7f313f6156d9873b7f5ebaba from golang/protobuf
    6026053 dev: proto: remove Proto3UnknownFields flag - merge b409cc5837a65fa96edf2a5e4f1ec2ccf0cc31a8 from golang/protobuf
    81f6217 dev: proto: reject invalid UTF-8 in strings - merge 35253352f94915c119f607b2cac4ef87bd3b085b from golang/protobuf
    4192d1c dev: proto: add logic to handle legacy message - merge 10c2d9d3cccc103717e4e5dc6c503fefc8a33dea from golang/protobuf
    9806df0 dev: jsonpb: change Marshal to trim timestamp/duration to 0 fractional digits if possible - merge f9bf3fbed3136fa83399f35204bf39644e205a30 from golang/protobuf
    a30fc23 dev: jsonpb: fix handling of illegal and negative nanoseconds - merge ac606b176499a528828d10c85583a7c3107939f6 from golang/protobuf
    b34bdd4 dev: proto: expose accessors for raw value of extensions - merge 5f34c20e59ed64239722b4215413f1ffd1efa9de from golang/protobuf
    54b14bf dev: Remove raw interface - merge 7d76aa1a8129e37aae7c421a64e04a4ced5ef1ac from golang/protobuf
    5f21c7a dev: Use fmt.Errorf instead of errors.New - merge 572071ce41835e834277d132bd34f72baa4754cc from golang/protobuf
    5028789 dev: jsonpb: change Marshal/Unmarshal to return error if any required field is not set - merge 2bc5431dca4a5134e05a24d7b874cd189e934a38 from golang/protobuf
    b56d376 dev: Cleanup comments and whitespace - merge 575152efd80e5accf3969091e05f9ec30b35a2f2 from golang/protobuf
    761ef94 dev: jsonpb: check for nil in Marshal and return error to avoid panic. - merge 49f2ba7d08e875af9b5f3bd5d2f29d5fb1ca86b1 from golang/protobuf
    88bd217 dev: Simplify code - merge 5c7dd3329b568cef186709cadf093cad82f8fdfc from golang/protobuf
    d2459a7 dev: Fix uint64->int overflow in table unmarshal - merge 1ec9e17d4d187ddb55cc9858887b2202b3f75707 from golang/protobuf
    b559abf dev: Correct some mistakes - merge 013f295b1c740bd8ca5ce84ea810940b1945fcb0 from golang/protobuf
    5ec47c3 dev: Remove unused code - merge 3ffccb49d84ed0b9eb1e518dd391a6d015adfeb4 from golang/protobuf
    44af720 Upstream (kata-containers#399): Merging upstream from golang/protobuf into dev branch golang/protobuf@8cc9e46
    1ef32a8 messagename
    49944b4 grpc error usage article
    58efb20 add mentions from Johan Brandhorst
    1d2310f merge bbd03ef6da3a115852eaf24c8a1c46aeb39aa175 from golang/protobuf
    ac06767 upgrade to go1.10
    9b87cea fix build for gopherjs that now requires go 1.10
    a74c03e fix build
    1ae71f0 fix for issue 389: importing of customtypes that are messages should not cause another import for the original message
    d5bc08a Update Readme.md
    f8f204f add new user : go-spacemesh
    b75782e protoc-min-version don't suppress protoc stdout and stderr out on success. (kata-containers#381)
    73bcffa Update Readme.md
    43a6153 More well known types (kata-containers#378)
    ff3a3b6 Added link to new blog post in README (kata-containers#375)
    1adfc12 merge 925541529c1fa6821df4e44ce2723319eb2be768 from golang/protobuf
    26de2f9 Added instructions for using proto files from google/protobuf (kata-containers#371)
    160de10 another user: zero stor
    d4d8b59 Update to protobuf 3.5.1 and minor cleanups for Golang 1.10 (kata-containers#363)
    35b81a0 Test with latest Go and protobuf patch versions. (kata-containers#352)
    aee20e7 plugin/equal: "return this == nil" to satisfy gosimple linter
    620da83 plugin/populate: avoid loops on non top-level packages
    cc007c0 example
    cd5e432 Incorporate review comments
    c4bc39e Mentioning the bit about proto_path up front
    ff2773e Ensure v3 to compile importduplicate.proto
    e683811 Minor update to the comment.
    bf3b9f4 Fix issue when provided f!=nil
    563235a Fix duplicate import names when same name used in different contexts
    3813b83 fix for testdata/my_test
    685a9b3 Test duplicate import names from proto package and generated code.
    b0a8a05 Removed unsafe stuff that got readded; regenerated .pb.go files
    8ddeac9 Update generated test files.
    c9c3a74 Update gogoproto/Makefile.
    f646b88 Review feedback
    b1c3a66 Add go_package
    7eaf46c min version 3 for my_test/test.proto
    3db9d03 Grammar Issues
    0c5dcd7 Update extensions.md
    acc574d merged 130e6b02ab059e7b717a096f397c5b60111cae74 from golang/protobuf
    2e9fe32 updated descriptor
    7cc42a6 merged 11b8df160996e00fd4b55cbaafb3d84ec6d50fa8 from golang/protobuf
    04380c3 merged 17ce1425424ab154092bbb43af630bd647f3bb0d from golang/protobuf
    92733a0 merged 5afd06f9d81a86d6e3bb7dc702d6bd148ea3ff23 from golang/protobuf
    79e6522 Revised comment regarding the uniqueness of package names.
    44008aa Regenerated pb.go files.
    48a47cb Fixed double import prefix issue.
    874a222 Fixed misleading comment.
    c59a8c7 Readded alias name to import statements.
    3ae4cfd Fix to avoid printing import alias when same as import path suffix.
    ca6d352 Fix to avoid long import alias names when not needed.

Shortlog since last vendoring of github.com/containerd/containerd:

    5e2d7ef Use a single custom annotation for export
    41b7b0e Ensure namespaced writer commit has correct namespace
    7f79fbb Move ttrpc client to pkg/ttrpcutil
    5b7a327 Improve atomic delete
    fe6a2b0 Add shim cgroup support for v2 runtimes
    62609d6 Fix typo in description comment
    90c6c1a Pass options on shim create for v2
    6907062 ctr: make ctr shim command easy to use
    7b06c9a Add TTRPC client
    5e962dd Remove unused Resize method from initState
    66036d9 v1: Respect the `shim_debug` flag when load tasks
    a6a888c Bump ttrpc
    fbb80b9 containerd-shim: redirect output into stdout fifo
    543d1e8 Add travis_wait to prevent vndr timing out
    00bc2f5 Update to Golang 1.12, and prepare for ppc64le
    67b45ae Add WithoutRefreshed metadata
    ad25c1a Improve ARM platform matching
    bd27bef Move checkpoint and restore commands to new files
    cf6e008 Fix fd leak of shim log
    6f463d3 test/snapshots: umount before committing snapshot
    3887053 snapshots/devmapper: deactivate thin device after committed
    bdd7dce Add OpenLab CI configuration
    660554d Fix error handling for task deletion.
    2ed8e60 bump google.golang.org/grpc v1.20.1
    d1c5951 bump google.golang.org/grpc v1.12.2
    2f22d8e Fix broken link to containerd logo
    cb7c780 ctr images import: add --no-unpack option
    ee902af Compute manifest metadata when not provided.
    5c9811d Cleanup dead v2 shim.
    cfc3638 Remove redundant error checks
    38e3696 Use cancel on errors
    eded188 Fix misspells
    969035b Stop logging error on v2 multi shim log failure
    c7f067f Update vendor/ with new required vndr go.mod files
    8c5779c bump containerd/ttrpc 699c4e40d1e7416e08bf7019c7ce2e9beced4636
    dff7456 Return NotFound error for kill and delete in deleted state.
    5d17ed2 Update cri to 2fc62db8146ce66f27b37306ad5fda34207835f3.
    e5aab17 bump opencontainers/selinux v1.2.2
    dd85aea bump runc v1.0.0-rc8
    5b9bd99 differ: fix deadlock on commit error
    48f4651 Support disabling default setup of shim logger.
    c79c792 bump docker/go-units v0.4.0
    dfa51c9 runtime-v1: kill shim in cleanupAfterDeadShim
    0376dd4 Don't write dumped stacks to file for ETW capture state
    e6fc0ed Convert Windows CI to use Microsoft MCR image urls
    06a3a48 bump containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
    a333dbc Update x/crypto to 88737f569e3a9c7ab309cdc09a07fe7fc87233c3
    0fd0256 bump gocapability
    7718d06 Write stack dump to `os.TempDir()` as well
    a4942ca Fix error on pull hang in CI
    6bcf463 Move to sha-specified test image for nanoserver
    cfb8b55 .mailmap: update Akihiro Suda's email address
    be2cbd0 Access to client's GRPC connection object
    78f3dc4 Allow dumping stacks via ETW capture state
    05dd66b Update go-winio in vendor.conf
    c9059c7 bump mistifyio/go-zfs f784269be439d704d3dfa1906f45dd848fed2beb
    63c7a87 Requeue events in the shim publisher
    fc167f9 Correct PusherFunc helper to match Pusher intf
    a7af3c1 Correct import path in services/server package
    9cc5878 Check task list to avoid unnecessary cleanup.
    97d247c Rename `hrpc` to `tcpServer`
    047348e Add dialer for events service
    ae87730 Improve shim shutdown logic
    a12f836 Use $TEST_RUNTIME for cri test.
    4b3b99e Add support for required plugins.
    4ba756e Fix API forward events for shims
    1a1f8f1 Set nofile to 1048576
    b911ae3 Add tcp service for grpc listeners
    a6f587e Use ttrpc to publish runtime v2 events
    a8a805c Add ttrpc server to containerd
    c93d645 Add GetOOMScore function
    ae5ca81 Refactor mount path check and add comments
    7045801 delete the ingest when any errors happen during resuming status
    dcf6023 Extend release timeline
    d5b770a Introduce 'clean-test' target in Makefile
    2583d9e update gogo/googleapis v1.2.0
    a98df70 update containerd/btrfs af5082808c833de0e79c1e72eea9fea239364877
    aa8dccd update containerd/aufs f894a800659b6e11c1a13084abd1712f346e349c
    ed61d7f bump containerd/zfs and dependencies
    d667628 bump github.com/pkg/errors v0.8.1
    68ef178 bump github.com/BurntSushi/toml v0.3.1
    1978c0b bump gotest.tools v2.3.0, google/go-cmp v0.2.0
    2741dbe contrib: Dockerfile: bump go 1.12
    a84f87d contrib: Dockerfile: add a base stage
    a07e12c contrib: Dockerfile: reformat, and use --no-install-recommends
    ba9e1ea contrib: Dockerfile: use build-arg for go-version
    4754d2a Update image export to support Docker format
    74eb0dc Return event publish errors.
    10cf21d Export ExitStatus init func
    a733587 Update cri to 6d353571e64417d80c9478ffaea793714dd539d0.
    de1da8b Update handling of registry errors
    c0f0b21 Apply PR feedback
    2a5e4c4 Skip rootfs unmount when no mounts are provided
    abfc89c Update CRI to master
    4730088 Update runc to resolve selinux issues
    2d11f5e Regenerate protobufs
    830b029 Update protobuf v1.2.0
    7c1365b bump sirupsen/logrus v1.4.1
    01310ea do not use unkeyed fields in compose literals
    90085a7 Add empty file to prevent build from failing
    8784eb6 Move snapshotters benchmark to a separate package
    adc4fa2 Use pkg/errors for all errors
    c22effb fix parseInfoFile does not handle spaces in filenames
    559dfa5 Add configurable plugin path
    d9526f5 Move CloudFormation template to contrib
    ae04c16 runtime: guard Close() until both streams are complete
    e96ac20 runtime: log IO error when copying output streams
    515be73 Add snapshotters benchmark
    8722966 fix shouldKillAllOnExit check for v2
    fa5f744 fix shouldKillAllOnExit check
    f7f6dd7 test: add custom cgroup test
    2b8df83 bump containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1
    bc6ac08 update opencontainers/runc v1.0.0-rc7
    808b223 Fix race and panic.
    87289a0 devmapper: implement Usage
    010b4da devmapper: implement dmsetup status
    8710940 Windows: Build shim binary from Microsoft/hcsshim
    e16e995 Vendor microsoft/hcsshim@8abdbb82
    5d50b9c Extend adaptImage function with annotations case
    388c8a1 Fastpath opt and ExecProcess loading
    a849664 Windows:ProgramFiles to ProgramData
    6034c19 Windows:Create root/state with ACL
    7361b19 Update Windows lcow differ to set NT VIRTUAL MACHINE\Virtual Machines SID
    4c9b5ef Update vendor github.com/Microsoft/go-winio
    d15832a Address review comments
    8f8fd3c seccomp: whitelist statx syscall
    908b771 Add code to return message field of returned registry errors
    9a8727c Allow to import an image for the default platform only.
    4506eb4 seccomp: whitelist io_pgetevents
    f3ff95a decouple api.ContentServer implementation package from bbolt dependency
    14a0506 ctr: fix image cmd ArgsUsage
    bdd84ab Add additional capability handling opts
    a631796 horten the unix socket path for shim
    b858cfb Makefile: allow overriding package name
    7ca2c3d contrib/nvidia: export helper binary path and list of Nvidia capabilities
    a7aeffc Update mailmap for cgroup authors
    e6ae9cc Shim pluggable logging
    506b815 remotes: add distribution labels to blob data
    b8d40b3 update runc to 2b18fe1d885ee5083ef9f0838fee39b62d653e30
    09cf2a6 Extend metadata images test with fieldpaths for Annotations
    5124f9e Write the Annotations map into the bolt db
    02cc148 Prepare boltutil for reading and writing another map
    1e893b1 devmapper: add no_devmapper build tag
    79248fe Add test for ocispec.Descriptor Annotations
    34f3772 Allow WithNewSnapshot and WithNewSnapshotView to take in snapshotter options.
    aaae811 Update checkpoint opts with runtime handling
    160737d Fix no pivot and keyring opts
    0b711d6 Copy annotations around where necessary
    4d2a26d BUILDING.md: update testing section
    6424a36 ctr/commands/images/push: don't show progress if it is debug mode
    7cfb99a Add content gc ref labels from containers, images, and snapshots
    f0d5dd3 Use unix.SignalNum in ParseSignal on unix platform
    1745951 Vendor golang.org/x/sys d455e41777fca6e8a5a79e34a14b8368bc11d9ba
    e13a4b6 Update the snapshotter docs to refer to the snapshots package for WithLabels.
    2771471 Fix issue with NewFIFOSetInDir with Terminal true
    828f6eb Fix a bug in shim log on Windows that can cause 100% CPU utilization
    c6703d4 Add missing annotations map to Descriptor for gRPC transfer
    d2bec54 Bump cgroups to dbea6f2bd41658b84b00417ceefa416b97
    208957b devmapper: proper cleanup in pool device test
    734989c Update README
    fb80483 docs: Add NAME section in all manpages
    95f0a49 devmapper: rollback thin devices on error
    adf5c64 devmapper: don't create or reload thin-pool from snapshotter
    7efda48 devmapper: more precise way of checking if device is activated
    37cdedc devmapper: add linux tags, fix build
    0c6d194 devmapper: add README and minor fixes
    2218275 devmapper: register plugin
    cec72ef devmapper: add snapshotter
    3a75882 devmapper: add pool device manager
    6e0ae68 devmapper: add snapshotter config
    fcd9dc2 devmapper: add pool metadata
    809e5fd devmapper: add dmsetup
    fe05e4d devmapper: add losetup
    d83e4e9 Vendor Microsoft/[email protected]
    e0d7ed1 Windows: Enable ETW logging
    cbc032e Update go.etcd.io/bbolt to v1.3.2
    5e84069 Update travis to xenial worker
    84a2471 Add runc.v2 multi-shim
    6bcbf88 Move runc shim code into common package
    fd6ac5d Vendor sirupsen/[email protected]
    b553a12 runtime: allow specifying supported platforms with config
    f6ac73d fixing typo and added a missing comment.
    4b3e0a8 metadata: merge snapshot labels with metadata's labels
    88f19a9 Windows: Update stackdump event name
    14f7e52 Unpack should set 0755 when the parent directory doesn't exist.
    a6f43b5 Add website update to release process
    17b2c84 Update supported versions
    b87e9ee Add ExecID for StateResponse
    bfb266a Fix some misspells in helpers_test.go
    dc09ed1 Add image handler wrapper
    a4f7b37 Add support for TaskDelete event on exec in RuntimeV2
    0089567 Stop sending stderr with TTY on Windows
    6a21728 Use defaults package for listing namespace labels
    14eaad0 Update runc to 6635b4f0c6af3810594d2770f662f34ddc15b40d (CVE-2019-5736)
    98766e8 Vendor opencontainers/runtime-spec 29686dbc
    225d9b1 Fix LCOW layer ordering
    0190e5f Removes the oci.test.exe binary.
    525802f Use distribution's reference.ParseDockerRef
    3538174 Bump github.com/docker/distribution to 0d3efadf0154c2b8a4e7b6621fff9809655cc580
    2dacef0 Add shim skeleton code
    59ea134 OCI Modifiers for Windows
    d25007e Add structure documentation for metadata
    823b7a8 Cleanup releases directory
    7bd8dcd Fix potential containerd panic.
    41f5406 Add release documentation
    f014adf readme: fix example for checkpoint
    dfcc594 Fix deadlock in Windows runhcs shim exec
    da2ab86 Add documentation for using namespace labels for configuring defaults.
    952d582 Add a separate lock for pid.
    9777d76 Revert "use state machine management for exec.Pid()"
    3432398 Use labels only when default namespace is provided and prefer given options.
    59432aa Take default runtime and snapshotter from namespace labels
    6629f85 BUILDING: update BUILDING.md
    d7ed403 Add image pull concurrency limit.
    7f5d7ff Update snapshots docs with garbage collector label
    34672d4 metadata/gc: remove the noop-loop for snapshot reference
    6ed293b Fix bug in shim path lookup
    d63099c Allow matching shim path side by side with containerd
    764afa0 Include extension for shim binary format on Windows
    dfebb40 remove excessive []byte(s) conversion
    85aa8ad Move task events to runc v2 shim
    28f8a90 Update cri plugin to 4dd6735020f5596dd41738f8c4f5cb07fa804c5e.
    bb32c0f Revendor github.com/Microsoft/hcsshim v0.8.4
    f444696 Return out of windows signal handler
    26ab393 Use context.Background for `O_NONBLOCK` `OpenFifo`.
    7db5697 unix.UtimesNanoAt now supported on Darwin
    132ee9b fix: linter issue
    6468619 Implement the Runtime v2 Shim async task model for runhcs
    b444d7d Handle additional cleanups from prior PR
    4ef9bf5 Windows: Publish exit status correctly in TaskExit
    90caf6f Windows:NewDirectIOFromFIFOSet
    3aec9e7 bump up runc
    0befa45 Update ttrpc to support context timeout.
    946e402 Update releases files
    c5a8c9f Fix issue in runhcs shim CloseIO
    31616e7 Fix runhcs shim bug in Create with "len(Rootfs) == 0"
    bcd4cc5 Fixes a bug in runhcs shim Exec.Pid
    bc76e01 Update runhcs options to include CRI Sandbox support
    a79879e Add security audit report to README
    dee0945 Fix spurious ttrpc client shutdown error log on success
    64a0046 Update cri-tools to v1.13.0.
    b55c9c6 Update cri to 4b4b2abb2eb19ad6913a6c5d2a6869a0a43a3fc1.
    17b77ae Fix annotation typo errors
    5137fc6 bugfix: support application/octet-stream during pull
    568b5be runtime: add Add/Delete method in PlatformRuntime interface
    7faaa64 fix: miss remove temp file in createSnapshot
    4247f26 metadata: define content sharing policy
    1be86af add test for WithImageConfigArgs
    36e4dc6 Ensure bundle removal is atomic
    723797d docs: remove website leftovers
    d4ecb00 checkpoint: return empty image if checkpointPath exist
    f2344db do not mutate defaults in replaceOrAppendEnvValues
    da9471f fix oci.WithImageConfigArgs for windows
    897afea Revert "Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)"
    0ec6526 Update the delete docs for Runtime V2 on Windows
    e20ba5f test: add test for c/r without image
    4026738 fix ctr image export not found error
    8be05eb Fix freebsd build
    7b1e6f3 fix: use func args instead of build new one
    9baecf6 fix: fix defer in loop
    903abf3 Fix annotation typo error
    52de371 Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)
    2d96aad bugfix: unpack should always set the snapshot gc label
    a2a4241 Add timeout and cancel to shim fifo open
    6f944e4 fix: SCHILY.xattrs should be SCHILY.xattr
    6ccb0d0 fix: remove dead code
    2db0c6c Explicitly stating utf-8 when fetching oauth token
    603e97a ctr/content: make editor flag is required
    7ac221e Adding ctr memory and cpu flags
    822ae18 Update cgroups to 1152b960fcee041f50df15cdc67c29db
    6593399 cr: support checkpoint/restore without image
    fd16bf6 runtimev2: add image-path and work-path for c/r
    83ebcf9 runtimev1: add image-path and work-path for c/r
    c5a0c7f Add build option "GODEBUG=1"

Shortlog since last vendoring of github.com/kata-containers/agent:

    5064045 docs: Add missing document link
    5583acd release: Kata Containers 1.7.0
    5f9df74 updateInterface: enable hot-add nic on arm64
    86ca8e0 vendor: update gogo/protobuf to v1.2.1
    c9343fb release: Kata Containers 1.7.0-rc1
    560dc87 vendor: update vsock package version
    0af7173 agent: support debug console
    d9aa453 proto: add network stats
    3169c9b docs: Fix markdown in TRACING.md
    8aa2880 release: Kata Containers 1.7.0-alpha1
    2ada1d1 agent: Display trace details
    cb32d28 test: Fix mockContainer
    3e12793 agent: Fix container creation
    6e558f7 vendor: Update libcontainer vendoring
    7fbd860 agent: send SIGKILL instead of SIGTERM to container init process
    8847998 agent: Add support for local storage
    8b34aaf make: Add build option STATIC=1 to statically link
    01b1cb2 travis: Use xenial
    d815c97 lint: Update code to handle lint issues
    828b417 ci: Update travis go version from 1.10 to 1.11
    f61ca8a release: Kata Containers 1.7.0-alpha0
    bdf2290 ci: travis: checkout test repo to correct branch
    209aa2f agent: Fix "agent grpc server quits" show wrong error
    2af3599 channel: Check for channel type in kernel cmdline options
    8187461 vendor: use latest github.com/mdlayher/vsock
    39696c0 vendor: Revert "vendor: Update libcontainer vendoring"
    7866668 agent: Revert "agent: Fix container creation"
    8f893b9 test: Revert "test: Fix mockContainer"
    49e5847 systemd-target: Add chronyd.service to kata-containers.target
    0bf9d1e make: Install systemd targets in systemd unit dir
    85e0942 docs: Explain shutdown behaviour with tracing
    99d6118 docs: Define "VM" in tracing doc
    353ec2d service: Fix user initiated shutdown with static tracing

Signed-off-by: lifupan <[email protected]>
lifupan added a commit to lifupan/kata-runtime that referenced this pull request May 23, 2019
Shimv2 needs the latest containerd, gogo/protobuf and agent vendors.

Fixes:kata-containers#1731

Shortlog since last vendoring of github.com/gogo/protobuf:

746e99c merged in golang/protobuf commit aa810b61a9c79d51363740d207bb46cf8e620ed5 - proto: fix handling of required fields after multiple violations
    4f863fb merged in golang/protobuf commit 89a0c16f4dc2a70c0ed864d8ef64878f24fdaa51 - README.md: remove usage of group in example
    2f3f4c2 merged in golang/protobuf commit 7d1b268556d691919f2262240737157830eab632 - jsonpb: avoid unexported fields in hand-crafted message (kata-containers#526)
    f2db49f merged in golang/protobuf commit f5983d50c82d70eaa88c17080245cc871558081f - proto: make invalid UTF-8 errors non-fatal (kata-containers#525)
    7aa71d7 merged in golang/protobuf commit 560bdb64431cc123098c2db67f16053a923a0688 - jsonpb: strictly document JSONPBMarshaler and JSONPBUnmarshaler behavior (kata-containers#524)
    eee5829 merged in golang/protobuf commit 93b26e6a70e37abb14f2f88194949312b0592a84 - protoc-gen-go: refactor generator by splitting up generateMessage
    ad62c6c part of golang's 427e165 commit. Missed removing this file with their test refactor
    efb8d72 merged in golang/protobuf commit 427e165155e0a4ff5993a36657c1f733f5b0f782 - proto: fix and cleanup test for deterministic marshal with custom marshalers
    7143b48 merged in golang/protobuf commit 14aad3d5ea4c323bcd7a2137e735da24a76e814c - jsonpb: avoid copying string-valued map-keys
    48e2601 merged in golang/protobuf commit 1325a051a2753cd67556b182843b1b693d0854cd -  proto: fix quadratic behavior in nested map marshaling (no size caching for stdduration/stdtime)
    bc71a26 merged in golang/protobuf commit f05648d464991ab1aa8cf6a499122c56f0f50f2f - jsonpb: handle map key and value properties properly
    be27d1b merged in golang/protobuf commit 9eb2c01ac278a5d89ce4b2be68fe4500955d8179 - jsonpb: decode int32/uint32/float32/float64 strings
    b43a52d merged in golang/protobuf commit 05f48f4eaf0e05663b562bab533cdd472238ce29 - proto: revert UTF-8 validation for proto2
    808c1f7 merged in golang/protobuf commit 64db29d85ff91ba669cfaf009d5f400a4da8a55f - jsonpb: error on scalar enum provided for repeated enums instead of panic
    07eab6a use only one write in the varint writer when possible (kata-containers#504)
    dd51cd8 fix typo independant to independent (kata-containers#512)
    211a54c Add godocs link to Readme.md (kata-containers#506)
    e87afe3 Fix text unmarshal for (u)int(8/16) fields (kata-containers#498)
    e5d5b02 Codegen for well-known types (kata-containers#489)
    6f222ca reorder some of the protoc paths in order to prefer our protobuf/google/protobuf/*.proto files. This is just to avoid using the wrong protos if you have the same protos in you gopath/src dir. (kata-containers#502)
    fd322a3 fix error: bad Go source code was generated, illegal hexadecimal number (kata-containers#488)
    61dbc13 Jsonpb custom type - kata-containers#411 (kata-containers#491)
    e14cafb Customtype  Warnings and issues  update (kata-containers#479)
    7c690ae Exact slice allocation for repeated packed varints (kata-containers#480)
    4aa4cc2 Adding missing func to CustomType documentation (kata-containers#483)
    5669497 bumped the go version (kata-containers#475)
    64d6d2f added nil check in Proto/Size methods fix kata-containers#444 (kata-containers#451)
    3e657e5 fix for letmegrpc (kata-containers#474)
    3cefc55 options to not generate xxx fields (kata-containers#467)
    4c0a09c updated to go1.11 and removed go1.9 (kata-containers#473)
    2b9e95f merged in golang/protobuf commit 70c277a8a150a8e069492e6600926300405c2884 - Fix unmarshaling JSON object with escaped string into Struct type. (kata-containers#464)
    2033462 merge in golang/protobuf commit 3a3da3a4e26776cc22a79ef46d5d58477532dede - proto: mention field name in error message (kata-containers#616) (kata-containers#465)
    98f6aa8 added license details to Readme.md (kata-containers#469)
    e66941c Update Readme.md (kata-containers#468)
    476a2e9 Set defaults on nonnullable fields (kata-containers#435) (kata-containers#459)
    5e81640 removed the GOPATH env dep in the makefile protopath (kata-containers#461)
    7af9d32 Fix nullable extension issues for non generated code (kata-containers#453)
    888d305 merge in golang/protobuf commit d7d60bc05d9f92d4692aa196ac022618c2d86655 - grpc: fix and improve interface comments for client/server types (kata-containers#604)
    a4350c5 merge in golang/protobuf commit 668a607657a5d387d6333648a2d9c749761fdc69 - LICENSE: Move title to README.md
    8599525 merged golang/protobuf commit 927b65914520a8b7d44f5c9057611cfec6b2e2d0 - proto: adjust documentation on RequiredNotSetError (kata-containers#603)
    8e3eb24 Fix wrong build tags (kata-containers#445)
    797fbbb merged commit 32a84b27e28ab9f681f0df16160c4ef1f6587094 from golang/pr… (kata-containers#446)
    baf2ea5  Added ProtoSize wrapper functions for the well known types  kata-containers#438 (kata-containers#443)
    5440baf exact slice allocation for fixed size packed fields (kata-containers#437)
    6eaa97b Added gRPC Course on Udemy (kata-containers#434)
    a4c2ffc Update Readme.md
    646de4d Fix typo (kata-containers#441)
    636bf03 fix kata-containers#427 consistent import naming between the import declaration and the vars in grpc
    7d68e88 fix build by regenerating everything
    fae8c2d fix git diff for travis
    2c42fe8 merged 7c4add53b497798e7fd7b204f28e41ab409bdbb7 from golang/protobuf. protoc-gen-go: remove deprecated function in grpc (kata-containers#426)
    ebc0565 merged 3fac2a27c94f99f4379551928df388fcb0ad37ce from golang/protobuf. ptypes: optimize Is to avoid prefix scan (kata-containers#425)
    37f19cd Handle deterministic marshaling for generated marshalers in XXX_Marshal
    67fcf76 Swap type assert and fix it (kata-containers#418)
    30cf7ac gofmt
    6b99319 travis: opt into apt get
    110e410 text: allow customtype to have a Bytes() method (kata-containers#227)
    99cb001 dev: amortize cost of growing a Buffer - merge fae8ec697c5d103f717d7fec21103cb5ec020bc8 from golang/protobuf
    1a0e3bd dev: proto: remove unused writeRaw function - merge d167f5cf056d2db6c0f53f44a3309ac60b99ab5b from golang/protobuf
    99bb9bf dev: Revert "protoc-gen-go: use standard library context (requires Go1.9) - merge bf2da8229df5077275b46b301818c6219ebe1003 from golang/protobuf
    9c8b44c dev: Implement "import public" using type aliases. - merge 6fb5325cf9e4b38b58cef6cd1f60c773cc2d5ad2 from golang/protobuf
    6487871 Expose vanity TurnOnGoRegistration (kata-containers#402)
    b8814cc dev: protoc-gen-go: fix generation of proxy getters for distant types - merge 9bb87600c289706cc58f76b46a91b05ddd2a44d8 from golang/protobuf
    9ddc509 dev: protoc-gen-go: fix up generation of package names - merge 3b4abe1a0672c5916c1937b8817dde8aeb579fe5 from golang/protobuf
    cbb7298 dev: protoc-gen-go: revert some API changes - merge 06c268a946d24fdcb0b59370c36ab876ece17556 from golang/protobuf
    8a67e47 dev: proto: do not allow unknown fields to satisfy required field bit - merge 91cccdb44a5fc8dfdf368e8b4d517a21de94dce9 from golang/protobuf
    265a302 dev: protoc-gen-go: Dont rely on local package name for mset name hack - merge 9c8fb7a95075eb047ab75e702de52f68ff360f17 from golang/protobuf
    00f8f1f dev: proto: ignore unknown fields in map entries - merge b028a76c61b7288aefe6746ab7b561d7eb15ab71 from golang/protobuf
    90d0c2a dev: conformance: remove useless variable declaration - merge conformance: remove useless variable declaration from golang/protobuf
    60491a7 dev: conformance: clean up, fix conformance tests - merge ab964bf603354327027b1974c2d1a199ce839899 from golang/protobuf
    9f8212a dev: protoc-gen-go: fix generation of public imports -merge 80c8f764516eebbf17174ea9fd61601d6a52f0f6 from golang/protobuf
    3860157 dev: Reduce a bunch of generated code in oneof sizers. - merge d0dc0def2e8a155b703a9b4966ca8f803ce06308 from golang/protobuf
    e41f35d protoc-gen-go: dont generate blank // import comment - merge b244a785444d0c500df2e0c6b968c05531365a00 from golang/protobuf
    6764c01 dev: golden_test: normalize path separators for Windows - merge 12a586e0adaf626e5d2f8da7881f321f076dbe2c from golang/protobuf
    e844e5c dev: protoc-gen-go: use standard library context (requires Go1.9) - merge 3dc8a89f965ba7bf716fd0d92b83c5da1792ab9c from golang/protobuf
    dfaf7a7 dev: protobuf: Delete makefiles, regenerate protos consistently - didnt merge everything, left Makefiles, but made the other small changes - merge 251359bf9d6712b0aefe759977c168b79d1f3a27 from golang/protobuf
    828b125 dev: protoc-gen-go: fix test - merge 2b3479d8d7175442fbfd46f4ba5c14d971aeb521 from golang/protobuf
    f5a1220 dev: protoc-gen-go: add paths=source_relative option - merge 6fb8a6f1c1f011b7fde2b40f72f46587180d8d25 from golang/protobuf
    214eb97 dev: fix golden tests for older protoc versions
    aa7e6f4 dev: protoc-gen-go: handle package import names per-file - merge 9d4962b4dc40a899c435fe1aaec48e683b4300ef from golang/protobuf
    08f8895 dev: protoc-gen-go: add test for various generation params - merge a1987161d42e479a8a593d7f66ff1be81574b1e0 from golang/protobuf
    d178c98 dev: protoc-gen-go: dont depend on input file ordering - merge f4733c73b342d1d1a07fda684e831f77f840a688 from golang/protobuf
    253b333 dev: protoc-gen-go: add more golden tests for imports - merge 15c34729da28f0a8c71325b8ee35ef19362290e6 from golang/protobuf
    100bcd0 dev: Rename generated Marshal and Unmarshal protobuf method - merge 60f8421f4063f411270d0527ca77697eb9f29f1e from golang/protobuf
    26c4e69 dev: protoc-gen-go: remove relative import in main_test.go - merge protoc-gen-go: remove relative import in main_test.go from golang/protobuf
    5f4a927 dev: protoc-gen-go: include canonical import comment - merge 1021ee9d478ac35478bd39859883102741f9c4c1 from golang/protobuf
    9c3ad97 dev: proto: avoid pointer arithmetic with invalidField - merge 649500c21ecd283d00f78859ac2f386df8ed2c96 from golang/protobuf
    e23e1bc dev: no more generated package doc - merge efae459c9350a60c1f8f503f34e3cb67f803a617 from golang/protobuf
    8b846a8 dev: Merge pull request kata-containers#520 from neild/dev.alias + Fix top-level Makefile to descend into protoc-gen-go. - merge 04869ad56b1a4eb4179ceadb8a1b787a9ce4b0a3, 8cbe6f4e7d1aa3a63d2ae35cf9e9eaa1aa4c6876, 025a21d09bcd80bade5d4d6c1fb7026dcf1056dd, f7e61e16d550efe3e664c64e8ef42b624b408643, 055d7b0dba6f8ba91c7e12e4f9cc891ba607f4e7, b322e49f0e384b8e162e1f55cdeedfbba461269c + 2c2f6de12273f767388d4f3aebf6306ae3a9c7cb from golang/protobuf
    2c90c88 upstream: add back proto.Sizer
    754b8fa dev: proto: treat bad wire types as unknown fields - merge e6af52bec88380a7a18ecc0977fa4312370a970b from golang/protobuf
    0091a58 dev: jsonpb: skip unexported or non-protobuf fields - merge 42d4f477264bec37ad9b729039d071eaedd32d9b from golang/protobuf
    504621d dev: protoc-gen-go: indicate deprecated fields in documentation - merge da3e23721ffb60cccccdef6dfaef948bce1ad9d7 from golang/protobuf
    5db6fbe dev: proto: support purego build tag - merge 9a84eb8532beb2edb9dfbd6a2d823e696b57b450 from golang/protobuf
    e1d2528 dev: proto: robustify tests that compare error messages - merge 57af8637f022e8bf7f313f6156d9873b7f5ebaba from golang/protobuf
    6026053 dev: proto: remove Proto3UnknownFields flag - merge b409cc5837a65fa96edf2a5e4f1ec2ccf0cc31a8 from golang/protobuf
    81f6217 dev: proto: reject invalid UTF-8 in strings - merge 35253352f94915c119f607b2cac4ef87bd3b085b from golang/protobuf
    4192d1c dev: proto: add logic to handle legacy message - merge 10c2d9d3cccc103717e4e5dc6c503fefc8a33dea from golang/protobuf
    9806df0 dev: jsonpb: change Marshal to trim timestamp/duration to 0 fractional digits if possible - merge f9bf3fbed3136fa83399f35204bf39644e205a30 from golang/protobuf
    a30fc23 dev: jsonpb: fix handling of illegal and negative nanoseconds - merge ac606b176499a528828d10c85583a7c3107939f6 from golang/protobuf
    b34bdd4 dev: proto: expose accessors for raw value of extensions - merge 5f34c20e59ed64239722b4215413f1ffd1efa9de from golang/protobuf
    54b14bf dev: Remove raw interface - merge 7d76aa1a8129e37aae7c421a64e04a4ced5ef1ac from golang/protobuf
    5f21c7a dev: Use fmt.Errorf instead of errors.New - merge 572071ce41835e834277d132bd34f72baa4754cc from golang/protobuf
    5028789 dev: jsonpb: change Marshal/Unmarshal to return error if any required field is not set - merge 2bc5431dca4a5134e05a24d7b874cd189e934a38 from golang/protobuf
    b56d376 dev: Cleanup comments and whitespace - merge 575152efd80e5accf3969091e05f9ec30b35a2f2 from golang/protobuf
    761ef94 dev: jsonpb: check for nil in Marshal and return error to avoid panic. - merge 49f2ba7d08e875af9b5f3bd5d2f29d5fb1ca86b1 from golang/protobuf
    88bd217 dev: Simplify code - merge 5c7dd3329b568cef186709cadf093cad82f8fdfc from golang/protobuf
    d2459a7 dev: Fix uint64->int overflow in table unmarshal - merge 1ec9e17d4d187ddb55cc9858887b2202b3f75707 from golang/protobuf
    b559abf dev: Correct some mistakes - merge 013f295b1c740bd8ca5ce84ea810940b1945fcb0 from golang/protobuf
    5ec47c3 dev: Remove unused code - merge 3ffccb49d84ed0b9eb1e518dd391a6d015adfeb4 from golang/protobuf
    44af720 Upstream (kata-containers#399): Merging upstream from golang/protobuf into dev branch golang/protobuf@8cc9e46
    1ef32a8 messagename
    49944b4 grpc error usage article
    58efb20 add mentions from Johan Brandhorst
    1d2310f merge bbd03ef6da3a115852eaf24c8a1c46aeb39aa175 from golang/protobuf
    ac06767 upgrade to go1.10
    9b87cea fix build for gopherjs that now requires go 1.10
    a74c03e fix build
    1ae71f0 fix for issue 389: importing of customtypes that are messages should not cause another import for the original message
    d5bc08a Update Readme.md
    f8f204f add new user : go-spacemesh
    b75782e protoc-min-version don't suppress protoc stdout and stderr out on success. (kata-containers#381)
    73bcffa Update Readme.md
    43a6153 More well known types (kata-containers#378)
    ff3a3b6 Added link to new blog post in README (kata-containers#375)
    1adfc12 merge 925541529c1fa6821df4e44ce2723319eb2be768 from golang/protobuf
    26de2f9 Added instructions for using proto files from google/protobuf (kata-containers#371)
    160de10 another user: zero stor
    d4d8b59 Update to protobuf 3.5.1 and minor cleanups for Golang 1.10 (kata-containers#363)
    35b81a0 Test with latest Go and protobuf patch versions. (kata-containers#352)
    aee20e7 plugin/equal: "return this == nil" to satisfy gosimple linter
    620da83 plugin/populate: avoid loops on non top-level packages
    cc007c0 example
    cd5e432 Incorporate review comments
    c4bc39e Mentioning the bit about proto_path up front
    ff2773e Ensure v3 to compile importduplicate.proto
    e683811 Minor update to the comment.
    bf3b9f4 Fix issue when provided f!=nil
    563235a Fix duplicate import names when same name used in different contexts
    3813b83 fix for testdata/my_test
    685a9b3 Test duplicate import names from proto package and generated code.
    b0a8a05 Removed unsafe stuff that got readded; regenerated .pb.go files
    8ddeac9 Update generated test files.
    c9c3a74 Update gogoproto/Makefile.
    f646b88 Review feedback
    b1c3a66 Add go_package
    7eaf46c min version 3 for my_test/test.proto
    3db9d03 Grammar Issues
    0c5dcd7 Update extensions.md
    acc574d merged 130e6b02ab059e7b717a096f397c5b60111cae74 from golang/protobuf
    2e9fe32 updated descriptor
    7cc42a6 merged 11b8df160996e00fd4b55cbaafb3d84ec6d50fa8 from golang/protobuf
    04380c3 merged 17ce1425424ab154092bbb43af630bd647f3bb0d from golang/protobuf
    92733a0 merged 5afd06f9d81a86d6e3bb7dc702d6bd148ea3ff23 from golang/protobuf
    79e6522 Revised comment regarding the uniqueness of package names.
    44008aa Regenerated pb.go files.
    48a47cb Fixed double import prefix issue.
    874a222 Fixed misleading comment.
    c59a8c7 Readded alias name to import statements.
    3ae4cfd Fix to avoid printing import alias when same as import path suffix.
    ca6d352 Fix to avoid long import alias names when not needed.

Shortlog since last vendoring of github.com/containerd/containerd:

    5e2d7ef Use a single custom annotation for export
    41b7b0e Ensure namespaced writer commit has correct namespace
    7f79fbb Move ttrpc client to pkg/ttrpcutil
    5b7a327 Improve atomic delete
    fe6a2b0 Add shim cgroup support for v2 runtimes
    62609d6 Fix typo in description comment
    90c6c1a Pass options on shim create for v2
    6907062 ctr: make ctr shim command easy to use
    7b06c9a Add TTRPC client
    5e962dd Remove unused Resize method from initState
    66036d9 v1: Respect the `shim_debug` flag when load tasks
    a6a888c Bump ttrpc
    fbb80b9 containerd-shim: redirect output into stdout fifo
    543d1e8 Add travis_wait to prevent vndr timing out
    00bc2f5 Update to Golang 1.12, and prepare for ppc64le
    67b45ae Add WithoutRefreshed metadata
    ad25c1a Improve ARM platform matching
    bd27bef Move checkpoint and restore commands to new files
    cf6e008 Fix fd leak of shim log
    6f463d3 test/snapshots: umount before committing snapshot
    3887053 snapshots/devmapper: deactivate thin device after committed
    bdd7dce Add OpenLab CI configuration
    660554d Fix error handling for task deletion.
    2ed8e60 bump google.golang.org/grpc v1.20.1
    d1c5951 bump google.golang.org/grpc v1.12.2
    2f22d8e Fix broken link to containerd logo
    cb7c780 ctr images import: add --no-unpack option
    ee902af Compute manifest metadata when not provided.
    5c9811d Cleanup dead v2 shim.
    cfc3638 Remove redundant error checks
    38e3696 Use cancel on errors
    eded188 Fix misspells
    969035b Stop logging error on v2 multi shim log failure
    c7f067f Update vendor/ with new required vndr go.mod files
    8c5779c bump containerd/ttrpc 699c4e40d1e7416e08bf7019c7ce2e9beced4636
    dff7456 Return NotFound error for kill and delete in deleted state.
    5d17ed2 Update cri to 2fc62db8146ce66f27b37306ad5fda34207835f3.
    e5aab17 bump opencontainers/selinux v1.2.2
    dd85aea bump runc v1.0.0-rc8
    5b9bd99 differ: fix deadlock on commit error
    48f4651 Support disabling default setup of shim logger.
    c79c792 bump docker/go-units v0.4.0
    dfa51c9 runtime-v1: kill shim in cleanupAfterDeadShim
    0376dd4 Don't write dumped stacks to file for ETW capture state
    e6fc0ed Convert Windows CI to use Microsoft MCR image urls
    06a3a48 bump containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
    a333dbc Update x/crypto to 88737f569e3a9c7ab309cdc09a07fe7fc87233c3
    0fd0256 bump gocapability
    7718d06 Write stack dump to `os.TempDir()` as well
    a4942ca Fix error on pull hang in CI
    6bcf463 Move to sha-specified test image for nanoserver
    cfb8b55 .mailmap: update Akihiro Suda's email address
    be2cbd0 Access to client's GRPC connection object
    78f3dc4 Allow dumping stacks via ETW capture state
    05dd66b Update go-winio in vendor.conf
    c9059c7 bump mistifyio/go-zfs f784269be439d704d3dfa1906f45dd848fed2beb
    63c7a87 Requeue events in the shim publisher
    fc167f9 Correct PusherFunc helper to match Pusher intf
    a7af3c1 Correct import path in services/server package
    9cc5878 Check task list to avoid unnecessary cleanup.
    97d247c Rename `hrpc` to `tcpServer`
    047348e Add dialer for events service
    ae87730 Improve shim shutdown logic
    a12f836 Use $TEST_RUNTIME for cri test.
    4b3b99e Add support for required plugins.
    4ba756e Fix API forward events for shims
    1a1f8f1 Set nofile to 1048576
    b911ae3 Add tcp service for grpc listeners
    a6f587e Use ttrpc to publish runtime v2 events
    a8a805c Add ttrpc server to containerd
    c93d645 Add GetOOMScore function
    ae5ca81 Refactor mount path check and add comments
    7045801 delete the ingest when any errors happen during resuming status
    dcf6023 Extend release timeline
    d5b770a Introduce 'clean-test' target in Makefile
    2583d9e update gogo/googleapis v1.2.0
    a98df70 update containerd/btrfs af5082808c833de0e79c1e72eea9fea239364877
    aa8dccd update containerd/aufs f894a800659b6e11c1a13084abd1712f346e349c
    ed61d7f bump containerd/zfs and dependencies
    d667628 bump github.com/pkg/errors v0.8.1
    68ef178 bump github.com/BurntSushi/toml v0.3.1
    1978c0b bump gotest.tools v2.3.0, google/go-cmp v0.2.0
    2741dbe contrib: Dockerfile: bump go 1.12
    a84f87d contrib: Dockerfile: add a base stage
    a07e12c contrib: Dockerfile: reformat, and use --no-install-recommends
    ba9e1ea contrib: Dockerfile: use build-arg for go-version
    4754d2a Update image export to support Docker format
    74eb0dc Return event publish errors.
    10cf21d Export ExitStatus init func
    a733587 Update cri to 6d353571e64417d80c9478ffaea793714dd539d0.
    de1da8b Update handling of registry errors
    c0f0b21 Apply PR feedback
    2a5e4c4 Skip rootfs unmount when no mounts are provided
    abfc89c Update CRI to master
    4730088 Update runc to resolve selinux issues
    2d11f5e Regenerate protobufs
    830b029 Update protobuf v1.2.0
    7c1365b bump sirupsen/logrus v1.4.1
    01310ea do not use unkeyed fields in compose literals
    90085a7 Add empty file to prevent build from failing
    8784eb6 Move snapshotters benchmark to a separate package
    adc4fa2 Use pkg/errors for all errors
    c22effb fix parseInfoFile does not handle spaces in filenames
    559dfa5 Add configurable plugin path
    d9526f5 Move CloudFormation template to contrib
    ae04c16 runtime: guard Close() until both streams are complete
    e96ac20 runtime: log IO error when copying output streams
    515be73 Add snapshotters benchmark
    8722966 fix shouldKillAllOnExit check for v2
    fa5f744 fix shouldKillAllOnExit check
    f7f6dd7 test: add custom cgroup test
    2b8df83 bump containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1
    bc6ac08 update opencontainers/runc v1.0.0-rc7
    808b223 Fix race and panic.
    87289a0 devmapper: implement Usage
    010b4da devmapper: implement dmsetup status
    8710940 Windows: Build shim binary from Microsoft/hcsshim
    e16e995 Vendor microsoft/hcsshim@8abdbb82
    5d50b9c Extend adaptImage function with annotations case
    388c8a1 Fastpath opt and ExecProcess loading
    a849664 Windows:ProgramFiles to ProgramData
    6034c19 Windows:Create root/state with ACL
    7361b19 Update Windows lcow differ to set NT VIRTUAL MACHINE\Virtual Machines SID
    4c9b5ef Update vendor github.com/Microsoft/go-winio
    d15832a Address review comments
    8f8fd3c seccomp: whitelist statx syscall
    908b771 Add code to return message field of returned registry errors
    9a8727c Allow to import an image for the default platform only.
    4506eb4 seccomp: whitelist io_pgetevents
    f3ff95a decouple api.ContentServer implementation package from bbolt dependency
    14a0506 ctr: fix image cmd ArgsUsage
    bdd84ab Add additional capability handling opts
    a631796 horten the unix socket path for shim
    b858cfb Makefile: allow overriding package name
    7ca2c3d contrib/nvidia: export helper binary path and list of Nvidia capabilities
    a7aeffc Update mailmap for cgroup authors
    e6ae9cc Shim pluggable logging
    506b815 remotes: add distribution labels to blob data
    b8d40b3 update runc to 2b18fe1d885ee5083ef9f0838fee39b62d653e30
    09cf2a6 Extend metadata images test with fieldpaths for Annotations
    5124f9e Write the Annotations map into the bolt db
    02cc148 Prepare boltutil for reading and writing another map
    1e893b1 devmapper: add no_devmapper build tag
    79248fe Add test for ocispec.Descriptor Annotations
    34f3772 Allow WithNewSnapshot and WithNewSnapshotView to take in snapshotter options.
    aaae811 Update checkpoint opts with runtime handling
    160737d Fix no pivot and keyring opts
    0b711d6 Copy annotations around where necessary
    4d2a26d BUILDING.md: update testing section
    6424a36 ctr/commands/images/push: don't show progress if it is debug mode
    7cfb99a Add content gc ref labels from containers, images, and snapshots
    f0d5dd3 Use unix.SignalNum in ParseSignal on unix platform
    1745951 Vendor golang.org/x/sys d455e41777fca6e8a5a79e34a14b8368bc11d9ba
    e13a4b6 Update the snapshotter docs to refer to the snapshots package for WithLabels.
    2771471 Fix issue with NewFIFOSetInDir with Terminal true
    828f6eb Fix a bug in shim log on Windows that can cause 100% CPU utilization
    c6703d4 Add missing annotations map to Descriptor for gRPC transfer
    d2bec54 Bump cgroups to dbea6f2bd41658b84b00417ceefa416b97
    208957b devmapper: proper cleanup in pool device test
    734989c Update README
    fb80483 docs: Add NAME section in all manpages
    95f0a49 devmapper: rollback thin devices on error
    adf5c64 devmapper: don't create or reload thin-pool from snapshotter
    7efda48 devmapper: more precise way of checking if device is activated
    37cdedc devmapper: add linux tags, fix build
    0c6d194 devmapper: add README and minor fixes
    2218275 devmapper: register plugin
    cec72ef devmapper: add snapshotter
    3a75882 devmapper: add pool device manager
    6e0ae68 devmapper: add snapshotter config
    fcd9dc2 devmapper: add pool metadata
    809e5fd devmapper: add dmsetup
    fe05e4d devmapper: add losetup
    d83e4e9 Vendor Microsoft/[email protected]
    e0d7ed1 Windows: Enable ETW logging
    cbc032e Update go.etcd.io/bbolt to v1.3.2
    5e84069 Update travis to xenial worker
    84a2471 Add runc.v2 multi-shim
    6bcbf88 Move runc shim code into common package
    fd6ac5d Vendor sirupsen/[email protected]
    b553a12 runtime: allow specifying supported platforms with config
    f6ac73d fixing typo and added a missing comment.
    4b3e0a8 metadata: merge snapshot labels with metadata's labels
    88f19a9 Windows: Update stackdump event name
    14f7e52 Unpack should set 0755 when the parent directory doesn't exist.
    a6f43b5 Add website update to release process
    17b2c84 Update supported versions
    b87e9ee Add ExecID for StateResponse
    bfb266a Fix some misspells in helpers_test.go
    dc09ed1 Add image handler wrapper
    a4f7b37 Add support for TaskDelete event on exec in RuntimeV2
    0089567 Stop sending stderr with TTY on Windows
    6a21728 Use defaults package for listing namespace labels
    14eaad0 Update runc to 6635b4f0c6af3810594d2770f662f34ddc15b40d (CVE-2019-5736)
    98766e8 Vendor opencontainers/runtime-spec 29686dbc
    225d9b1 Fix LCOW layer ordering
    0190e5f Removes the oci.test.exe binary.
    525802f Use distribution's reference.ParseDockerRef
    3538174 Bump github.com/docker/distribution to 0d3efadf0154c2b8a4e7b6621fff9809655cc580
    2dacef0 Add shim skeleton code
    59ea134 OCI Modifiers for Windows
    d25007e Add structure documentation for metadata
    823b7a8 Cleanup releases directory
    7bd8dcd Fix potential containerd panic.
    41f5406 Add release documentation
    f014adf readme: fix example for checkpoint
    dfcc594 Fix deadlock in Windows runhcs shim exec
    da2ab86 Add documentation for using namespace labels for configuring defaults.
    952d582 Add a separate lock for pid.
    9777d76 Revert "use state machine management for exec.Pid()"
    3432398 Use labels only when default namespace is provided and prefer given options.
    59432aa Take default runtime and snapshotter from namespace labels
    6629f85 BUILDING: update BUILDING.md
    d7ed403 Add image pull concurrency limit.
    7f5d7ff Update snapshots docs with garbage collector label
    34672d4 metadata/gc: remove the noop-loop for snapshot reference
    6ed293b Fix bug in shim path lookup
    d63099c Allow matching shim path side by side with containerd
    764afa0 Include extension for shim binary format on Windows
    dfebb40 remove excessive []byte(s) conversion
    85aa8ad Move task events to runc v2 shim
    28f8a90 Update cri plugin to 4dd6735020f5596dd41738f8c4f5cb07fa804c5e.
    bb32c0f Revendor github.com/Microsoft/hcsshim v0.8.4
    f444696 Return out of windows signal handler
    26ab393 Use context.Background for `O_NONBLOCK` `OpenFifo`.
    7db5697 unix.UtimesNanoAt now supported on Darwin
    132ee9b fix: linter issue
    6468619 Implement the Runtime v2 Shim async task model for runhcs
    b444d7d Handle additional cleanups from prior PR
    4ef9bf5 Windows: Publish exit status correctly in TaskExit
    90caf6f Windows:NewDirectIOFromFIFOSet
    3aec9e7 bump up runc
    0befa45 Update ttrpc to support context timeout.
    946e402 Update releases files
    c5a8c9f Fix issue in runhcs shim CloseIO
    31616e7 Fix runhcs shim bug in Create with "len(Rootfs) == 0"
    bcd4cc5 Fixes a bug in runhcs shim Exec.Pid
    bc76e01 Update runhcs options to include CRI Sandbox support
    a79879e Add security audit report to README
    dee0945 Fix spurious ttrpc client shutdown error log on success
    64a0046 Update cri-tools to v1.13.0.
    b55c9c6 Update cri to 4b4b2abb2eb19ad6913a6c5d2a6869a0a43a3fc1.
    17b77ae Fix annotation typo errors
    5137fc6 bugfix: support application/octet-stream during pull
    568b5be runtime: add Add/Delete method in PlatformRuntime interface
    7faaa64 fix: miss remove temp file in createSnapshot
    4247f26 metadata: define content sharing policy
    1be86af add test for WithImageConfigArgs
    36e4dc6 Ensure bundle removal is atomic
    723797d docs: remove website leftovers
    d4ecb00 checkpoint: return empty image if checkpointPath exist
    f2344db do not mutate defaults in replaceOrAppendEnvValues
    da9471f fix oci.WithImageConfigArgs for windows
    897afea Revert "Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)"
    0ec6526 Update the delete docs for Runtime V2 on Windows
    e20ba5f test: add test for c/r without image
    4026738 fix ctr image export not found error
    8be05eb Fix freebsd build
    7b1e6f3 fix: use func args instead of build new one
    9baecf6 fix: fix defer in loop
    903abf3 Fix annotation typo error
    52de371 Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)
    2d96aad bugfix: unpack should always set the snapshot gc label
    a2a4241 Add timeout and cancel to shim fifo open
    6f944e4 fix: SCHILY.xattrs should be SCHILY.xattr
    6ccb0d0 fix: remove dead code
    2db0c6c Explicitly stating utf-8 when fetching oauth token
    603e97a ctr/content: make editor flag is required
    7ac221e Adding ctr memory and cpu flags
    822ae18 Update cgroups to 1152b960fcee041f50df15cdc67c29db
    6593399 cr: support checkpoint/restore without image
    fd16bf6 runtimev2: add image-path and work-path for c/r
    83ebcf9 runtimev1: add image-path and work-path for c/r
    c5a0c7f Add build option "GODEBUG=1"

Shortlog since last vendoring of github.com/kata-containers/agent:

    5064045 docs: Add missing document link
    5583acd release: Kata Containers 1.7.0
    5f9df74 updateInterface: enable hot-add nic on arm64
    86ca8e0 vendor: update gogo/protobuf to v1.2.1
    c9343fb release: Kata Containers 1.7.0-rc1
    560dc87 vendor: update vsock package version
    0af7173 agent: support debug console
    d9aa453 proto: add network stats
    3169c9b docs: Fix markdown in TRACING.md
    8aa2880 release: Kata Containers 1.7.0-alpha1
    2ada1d1 agent: Display trace details
    cb32d28 test: Fix mockContainer
    3e12793 agent: Fix container creation
    6e558f7 vendor: Update libcontainer vendoring
    7fbd860 agent: send SIGKILL instead of SIGTERM to container init process
    8847998 agent: Add support for local storage
    8b34aaf make: Add build option STATIC=1 to statically link
    01b1cb2 travis: Use xenial
    d815c97 lint: Update code to handle lint issues
    828b417 ci: Update travis go version from 1.10 to 1.11
    f61ca8a release: Kata Containers 1.7.0-alpha0
    bdf2290 ci: travis: checkout test repo to correct branch
    209aa2f agent: Fix "agent grpc server quits" show wrong error
    2af3599 channel: Check for channel type in kernel cmdline options
    8187461 vendor: use latest github.com/mdlayher/vsock
    39696c0 vendor: Revert "vendor: Update libcontainer vendoring"
    7866668 agent: Revert "agent: Fix container creation"
    8f893b9 test: Revert "test: Fix mockContainer"
    49e5847 systemd-target: Add chronyd.service to kata-containers.target
    0bf9d1e make: Install systemd targets in systemd unit dir
    85e0942 docs: Explain shutdown behaviour with tracing
    99d6118 docs: Define "VM" in tracing doc
    353ec2d service: Fix user initiated shutdown with static tracing

Signed-off-by: lifupan <[email protected]>
ganeshmaharaj pushed a commit to ganeshmaharaj/kata-runtime that referenced this pull request Jun 3, 2019
Shimv2 needs the latest containerd, gogo/protobuf and agent vendors.

Fixes:kata-containers#1731

Shortlog since last vendoring of github.com/gogo/protobuf:

746e99c merged in golang/protobuf commit aa810b61a9c79d51363740d207bb46cf8e620ed5 - proto: fix handling of required fields after multiple violations
    4f863fb merged in golang/protobuf commit 89a0c16f4dc2a70c0ed864d8ef64878f24fdaa51 - README.md: remove usage of group in example
    2f3f4c2 merged in golang/protobuf commit 7d1b268556d691919f2262240737157830eab632 - jsonpb: avoid unexported fields in hand-crafted message (kata-containers#526)
    f2db49f merged in golang/protobuf commit f5983d50c82d70eaa88c17080245cc871558081f - proto: make invalid UTF-8 errors non-fatal (kata-containers#525)
    7aa71d7 merged in golang/protobuf commit 560bdb64431cc123098c2db67f16053a923a0688 - jsonpb: strictly document JSONPBMarshaler and JSONPBUnmarshaler behavior (kata-containers#524)
    eee5829 merged in golang/protobuf commit 93b26e6a70e37abb14f2f88194949312b0592a84 - protoc-gen-go: refactor generator by splitting up generateMessage
    ad62c6c part of golang's 427e165 commit. Missed removing this file with their test refactor
    efb8d72 merged in golang/protobuf commit 427e165155e0a4ff5993a36657c1f733f5b0f782 - proto: fix and cleanup test for deterministic marshal with custom marshalers
    7143b48 merged in golang/protobuf commit 14aad3d5ea4c323bcd7a2137e735da24a76e814c - jsonpb: avoid copying string-valued map-keys
    48e2601 merged in golang/protobuf commit 1325a051a2753cd67556b182843b1b693d0854cd -  proto: fix quadratic behavior in nested map marshaling (no size caching for stdduration/stdtime)
    bc71a26 merged in golang/protobuf commit f05648d464991ab1aa8cf6a499122c56f0f50f2f - jsonpb: handle map key and value properties properly
    be27d1b merged in golang/protobuf commit 9eb2c01ac278a5d89ce4b2be68fe4500955d8179 - jsonpb: decode int32/uint32/float32/float64 strings
    b43a52d merged in golang/protobuf commit 05f48f4eaf0e05663b562bab533cdd472238ce29 - proto: revert UTF-8 validation for proto2
    808c1f7 merged in golang/protobuf commit 64db29d85ff91ba669cfaf009d5f400a4da8a55f - jsonpb: error on scalar enum provided for repeated enums instead of panic
    07eab6a use only one write in the varint writer when possible (kata-containers#504)
    dd51cd8 fix typo independant to independent (kata-containers#512)
    211a54c Add godocs link to Readme.md (kata-containers#506)
    e87afe3 Fix text unmarshal for (u)int(8/16) fields (kata-containers#498)
    e5d5b02 Codegen for well-known types (kata-containers#489)
    6f222ca reorder some of the protoc paths in order to prefer our protobuf/google/protobuf/*.proto files. This is just to avoid using the wrong protos if you have the same protos in you gopath/src dir. (kata-containers#502)
    fd322a3 fix error: bad Go source code was generated, illegal hexadecimal number (kata-containers#488)
    61dbc13 Jsonpb custom type - kata-containers#411 (kata-containers#491)
    e14cafb Customtype  Warnings and issues  update (kata-containers#479)
    7c690ae Exact slice allocation for repeated packed varints (kata-containers#480)
    4aa4cc2 Adding missing func to CustomType documentation (kata-containers#483)
    5669497 bumped the go version (kata-containers#475)
    64d6d2f added nil check in Proto/Size methods fix kata-containers#444 (kata-containers#451)
    3e657e5 fix for letmegrpc (kata-containers#474)
    3cefc55 options to not generate xxx fields (kata-containers#467)
    4c0a09c updated to go1.11 and removed go1.9 (kata-containers#473)
    2b9e95f merged in golang/protobuf commit 70c277a8a150a8e069492e6600926300405c2884 - Fix unmarshaling JSON object with escaped string into Struct type. (kata-containers#464)
    2033462 merge in golang/protobuf commit 3a3da3a4e26776cc22a79ef46d5d58477532dede - proto: mention field name in error message (kata-containers#616) (kata-containers#465)
    98f6aa8 added license details to Readme.md (kata-containers#469)
    e66941c Update Readme.md (kata-containers#468)
    476a2e9 Set defaults on nonnullable fields (kata-containers#435) (kata-containers#459)
    5e81640 removed the GOPATH env dep in the makefile protopath (kata-containers#461)
    7af9d32 Fix nullable extension issues for non generated code (kata-containers#453)
    888d305 merge in golang/protobuf commit d7d60bc05d9f92d4692aa196ac022618c2d86655 - grpc: fix and improve interface comments for client/server types (kata-containers#604)
    a4350c5 merge in golang/protobuf commit 668a607657a5d387d6333648a2d9c749761fdc69 - LICENSE: Move title to README.md
    8599525 merged golang/protobuf commit 927b65914520a8b7d44f5c9057611cfec6b2e2d0 - proto: adjust documentation on RequiredNotSetError (kata-containers#603)
    8e3eb24 Fix wrong build tags (kata-containers#445)
    797fbbb merged commit 32a84b27e28ab9f681f0df16160c4ef1f6587094 from golang/pr… (kata-containers#446)
    baf2ea5  Added ProtoSize wrapper functions for the well known types  kata-containers#438 (kata-containers#443)
    5440baf exact slice allocation for fixed size packed fields (kata-containers#437)
    6eaa97b Added gRPC Course on Udemy (kata-containers#434)
    a4c2ffc Update Readme.md
    646de4d Fix typo (kata-containers#441)
    636bf03 fix kata-containers#427 consistent import naming between the import declaration and the vars in grpc
    7d68e88 fix build by regenerating everything
    fae8c2d fix git diff for travis
    2c42fe8 merged 7c4add53b497798e7fd7b204f28e41ab409bdbb7 from golang/protobuf. protoc-gen-go: remove deprecated function in grpc (kata-containers#426)
    ebc0565 merged 3fac2a27c94f99f4379551928df388fcb0ad37ce from golang/protobuf. ptypes: optimize Is to avoid prefix scan (kata-containers#425)
    37f19cd Handle deterministic marshaling for generated marshalers in XXX_Marshal
    67fcf76 Swap type assert and fix it (kata-containers#418)
    30cf7ac gofmt
    6b99319 travis: opt into apt get
    110e410 text: allow customtype to have a Bytes() method (kata-containers#227)
    99cb001 dev: amortize cost of growing a Buffer - merge fae8ec697c5d103f717d7fec21103cb5ec020bc8 from golang/protobuf
    1a0e3bd dev: proto: remove unused writeRaw function - merge d167f5cf056d2db6c0f53f44a3309ac60b99ab5b from golang/protobuf
    99bb9bf dev: Revert "protoc-gen-go: use standard library context (requires Go1.9) - merge bf2da8229df5077275b46b301818c6219ebe1003 from golang/protobuf
    9c8b44c dev: Implement "import public" using type aliases. - merge 6fb5325cf9e4b38b58cef6cd1f60c773cc2d5ad2 from golang/protobuf
    6487871 Expose vanity TurnOnGoRegistration (kata-containers#402)
    b8814cc dev: protoc-gen-go: fix generation of proxy getters for distant types - merge 9bb87600c289706cc58f76b46a91b05ddd2a44d8 from golang/protobuf
    9ddc509 dev: protoc-gen-go: fix up generation of package names - merge 3b4abe1a0672c5916c1937b8817dde8aeb579fe5 from golang/protobuf
    cbb7298 dev: protoc-gen-go: revert some API changes - merge 06c268a946d24fdcb0b59370c36ab876ece17556 from golang/protobuf
    8a67e47 dev: proto: do not allow unknown fields to satisfy required field bit - merge 91cccdb44a5fc8dfdf368e8b4d517a21de94dce9 from golang/protobuf
    265a302 dev: protoc-gen-go: Dont rely on local package name for mset name hack - merge 9c8fb7a95075eb047ab75e702de52f68ff360f17 from golang/protobuf
    00f8f1f dev: proto: ignore unknown fields in map entries - merge b028a76c61b7288aefe6746ab7b561d7eb15ab71 from golang/protobuf
    90d0c2a dev: conformance: remove useless variable declaration - merge conformance: remove useless variable declaration from golang/protobuf
    60491a7 dev: conformance: clean up, fix conformance tests - merge ab964bf603354327027b1974c2d1a199ce839899 from golang/protobuf
    9f8212a dev: protoc-gen-go: fix generation of public imports -merge 80c8f764516eebbf17174ea9fd61601d6a52f0f6 from golang/protobuf
    3860157 dev: Reduce a bunch of generated code in oneof sizers. - merge d0dc0def2e8a155b703a9b4966ca8f803ce06308 from golang/protobuf
    e41f35d protoc-gen-go: dont generate blank // import comment - merge b244a785444d0c500df2e0c6b968c05531365a00 from golang/protobuf
    6764c01 dev: golden_test: normalize path separators for Windows - merge 12a586e0adaf626e5d2f8da7881f321f076dbe2c from golang/protobuf
    e844e5c dev: protoc-gen-go: use standard library context (requires Go1.9) - merge 3dc8a89f965ba7bf716fd0d92b83c5da1792ab9c from golang/protobuf
    dfaf7a7 dev: protobuf: Delete makefiles, regenerate protos consistently - didnt merge everything, left Makefiles, but made the other small changes - merge 251359bf9d6712b0aefe759977c168b79d1f3a27 from golang/protobuf
    828b125 dev: protoc-gen-go: fix test - merge 2b3479d8d7175442fbfd46f4ba5c14d971aeb521 from golang/protobuf
    f5a1220 dev: protoc-gen-go: add paths=source_relative option - merge 6fb8a6f1c1f011b7fde2b40f72f46587180d8d25 from golang/protobuf
    214eb97 dev: fix golden tests for older protoc versions
    aa7e6f4 dev: protoc-gen-go: handle package import names per-file - merge 9d4962b4dc40a899c435fe1aaec48e683b4300ef from golang/protobuf
    08f8895 dev: protoc-gen-go: add test for various generation params - merge a1987161d42e479a8a593d7f66ff1be81574b1e0 from golang/protobuf
    d178c98 dev: protoc-gen-go: dont depend on input file ordering - merge f4733c73b342d1d1a07fda684e831f77f840a688 from golang/protobuf
    253b333 dev: protoc-gen-go: add more golden tests for imports - merge 15c34729da28f0a8c71325b8ee35ef19362290e6 from golang/protobuf
    100bcd0 dev: Rename generated Marshal and Unmarshal protobuf method - merge 60f8421f4063f411270d0527ca77697eb9f29f1e from golang/protobuf
    26c4e69 dev: protoc-gen-go: remove relative import in main_test.go - merge protoc-gen-go: remove relative import in main_test.go from golang/protobuf
    5f4a927 dev: protoc-gen-go: include canonical import comment - merge 1021ee9d478ac35478bd39859883102741f9c4c1 from golang/protobuf
    9c3ad97 dev: proto: avoid pointer arithmetic with invalidField - merge 649500c21ecd283d00f78859ac2f386df8ed2c96 from golang/protobuf
    e23e1bc dev: no more generated package doc - merge efae459c9350a60c1f8f503f34e3cb67f803a617 from golang/protobuf
    8b846a8 dev: Merge pull request kata-containers#520 from neild/dev.alias + Fix top-level Makefile to descend into protoc-gen-go. - merge 04869ad56b1a4eb4179ceadb8a1b787a9ce4b0a3, 8cbe6f4e7d1aa3a63d2ae35cf9e9eaa1aa4c6876, 025a21d09bcd80bade5d4d6c1fb7026dcf1056dd, f7e61e16d550efe3e664c64e8ef42b624b408643, 055d7b0dba6f8ba91c7e12e4f9cc891ba607f4e7, b322e49f0e384b8e162e1f55cdeedfbba461269c + 2c2f6de12273f767388d4f3aebf6306ae3a9c7cb from golang/protobuf
    2c90c88 upstream: add back proto.Sizer
    754b8fa dev: proto: treat bad wire types as unknown fields - merge e6af52bec88380a7a18ecc0977fa4312370a970b from golang/protobuf
    0091a58 dev: jsonpb: skip unexported or non-protobuf fields - merge 42d4f477264bec37ad9b729039d071eaedd32d9b from golang/protobuf
    504621d dev: protoc-gen-go: indicate deprecated fields in documentation - merge da3e23721ffb60cccccdef6dfaef948bce1ad9d7 from golang/protobuf
    5db6fbe dev: proto: support purego build tag - merge 9a84eb8532beb2edb9dfbd6a2d823e696b57b450 from golang/protobuf
    e1d2528 dev: proto: robustify tests that compare error messages - merge 57af8637f022e8bf7f313f6156d9873b7f5ebaba from golang/protobuf
    6026053 dev: proto: remove Proto3UnknownFields flag - merge b409cc5837a65fa96edf2a5e4f1ec2ccf0cc31a8 from golang/protobuf
    81f6217 dev: proto: reject invalid UTF-8 in strings - merge 35253352f94915c119f607b2cac4ef87bd3b085b from golang/protobuf
    4192d1c dev: proto: add logic to handle legacy message - merge 10c2d9d3cccc103717e4e5dc6c503fefc8a33dea from golang/protobuf
    9806df0 dev: jsonpb: change Marshal to trim timestamp/duration to 0 fractional digits if possible - merge f9bf3fbed3136fa83399f35204bf39644e205a30 from golang/protobuf
    a30fc23 dev: jsonpb: fix handling of illegal and negative nanoseconds - merge ac606b176499a528828d10c85583a7c3107939f6 from golang/protobuf
    b34bdd4 dev: proto: expose accessors for raw value of extensions - merge 5f34c20e59ed64239722b4215413f1ffd1efa9de from golang/protobuf
    54b14bf dev: Remove raw interface - merge 7d76aa1a8129e37aae7c421a64e04a4ced5ef1ac from golang/protobuf
    5f21c7a dev: Use fmt.Errorf instead of errors.New - merge 572071ce41835e834277d132bd34f72baa4754cc from golang/protobuf
    5028789 dev: jsonpb: change Marshal/Unmarshal to return error if any required field is not set - merge 2bc5431dca4a5134e05a24d7b874cd189e934a38 from golang/protobuf
    b56d376 dev: Cleanup comments and whitespace - merge 575152efd80e5accf3969091e05f9ec30b35a2f2 from golang/protobuf
    761ef94 dev: jsonpb: check for nil in Marshal and return error to avoid panic. - merge 49f2ba7d08e875af9b5f3bd5d2f29d5fb1ca86b1 from golang/protobuf
    88bd217 dev: Simplify code - merge 5c7dd3329b568cef186709cadf093cad82f8fdfc from golang/protobuf
    d2459a7 dev: Fix uint64->int overflow in table unmarshal - merge 1ec9e17d4d187ddb55cc9858887b2202b3f75707 from golang/protobuf
    b559abf dev: Correct some mistakes - merge 013f295b1c740bd8ca5ce84ea810940b1945fcb0 from golang/protobuf
    5ec47c3 dev: Remove unused code - merge 3ffccb49d84ed0b9eb1e518dd391a6d015adfeb4 from golang/protobuf
    44af720 Upstream (kata-containers#399): Merging upstream from golang/protobuf into dev branch golang/protobuf@8cc9e46
    1ef32a8 messagename
    49944b4 grpc error usage article
    58efb20 add mentions from Johan Brandhorst
    1d2310f merge bbd03ef6da3a115852eaf24c8a1c46aeb39aa175 from golang/protobuf
    ac06767 upgrade to go1.10
    9b87cea fix build for gopherjs that now requires go 1.10
    a74c03e fix build
    1ae71f0 fix for issue 389: importing of customtypes that are messages should not cause another import for the original message
    d5bc08a Update Readme.md
    f8f204f add new user : go-spacemesh
    b75782e protoc-min-version don't suppress protoc stdout and stderr out on success. (kata-containers#381)
    73bcffa Update Readme.md
    43a6153 More well known types (kata-containers#378)
    ff3a3b6 Added link to new blog post in README (kata-containers#375)
    1adfc12 merge 925541529c1fa6821df4e44ce2723319eb2be768 from golang/protobuf
    26de2f9 Added instructions for using proto files from google/protobuf (kata-containers#371)
    160de10 another user: zero stor
    d4d8b59 Update to protobuf 3.5.1 and minor cleanups for Golang 1.10 (kata-containers#363)
    35b81a0 Test with latest Go and protobuf patch versions. (kata-containers#352)
    aee20e7 plugin/equal: "return this == nil" to satisfy gosimple linter
    620da83 plugin/populate: avoid loops on non top-level packages
    cc007c0 example
    cd5e432 Incorporate review comments
    c4bc39e Mentioning the bit about proto_path up front
    ff2773e Ensure v3 to compile importduplicate.proto
    e683811 Minor update to the comment.
    bf3b9f4 Fix issue when provided f!=nil
    563235a Fix duplicate import names when same name used in different contexts
    3813b83 fix for testdata/my_test
    685a9b3 Test duplicate import names from proto package and generated code.
    b0a8a05 Removed unsafe stuff that got readded; regenerated .pb.go files
    8ddeac9 Update generated test files.
    c9c3a74 Update gogoproto/Makefile.
    f646b88 Review feedback
    b1c3a66 Add go_package
    7eaf46c min version 3 for my_test/test.proto
    3db9d03 Grammar Issues
    0c5dcd7 Update extensions.md
    acc574d merged 130e6b02ab059e7b717a096f397c5b60111cae74 from golang/protobuf
    2e9fe32 updated descriptor
    7cc42a6 merged 11b8df160996e00fd4b55cbaafb3d84ec6d50fa8 from golang/protobuf
    04380c3 merged 17ce1425424ab154092bbb43af630bd647f3bb0d from golang/protobuf
    92733a0 merged 5afd06f9d81a86d6e3bb7dc702d6bd148ea3ff23 from golang/protobuf
    79e6522 Revised comment regarding the uniqueness of package names.
    44008aa Regenerated pb.go files.
    48a47cb Fixed double import prefix issue.
    874a222 Fixed misleading comment.
    c59a8c7 Readded alias name to import statements.
    3ae4cfd Fix to avoid printing import alias when same as import path suffix.
    ca6d352 Fix to avoid long import alias names when not needed.

Shortlog since last vendoring of github.com/containerd/containerd:

    5e2d7ef Use a single custom annotation for export
    41b7b0e Ensure namespaced writer commit has correct namespace
    7f79fbb Move ttrpc client to pkg/ttrpcutil
    5b7a327 Improve atomic delete
    fe6a2b0 Add shim cgroup support for v2 runtimes
    62609d6 Fix typo in description comment
    90c6c1a Pass options on shim create for v2
    6907062 ctr: make ctr shim command easy to use
    7b06c9a Add TTRPC client
    5e962dd Remove unused Resize method from initState
    66036d9 v1: Respect the `shim_debug` flag when load tasks
    a6a888c Bump ttrpc
    fbb80b9 containerd-shim: redirect output into stdout fifo
    543d1e8 Add travis_wait to prevent vndr timing out
    00bc2f5 Update to Golang 1.12, and prepare for ppc64le
    67b45ae Add WithoutRefreshed metadata
    ad25c1a Improve ARM platform matching
    bd27bef Move checkpoint and restore commands to new files
    cf6e008 Fix fd leak of shim log
    6f463d3 test/snapshots: umount before committing snapshot
    3887053 snapshots/devmapper: deactivate thin device after committed
    bdd7dce Add OpenLab CI configuration
    660554d Fix error handling for task deletion.
    2ed8e60 bump google.golang.org/grpc v1.20.1
    d1c5951 bump google.golang.org/grpc v1.12.2
    2f22d8e Fix broken link to containerd logo
    cb7c780 ctr images import: add --no-unpack option
    ee902af Compute manifest metadata when not provided.
    5c9811d Cleanup dead v2 shim.
    cfc3638 Remove redundant error checks
    38e3696 Use cancel on errors
    eded188 Fix misspells
    969035b Stop logging error on v2 multi shim log failure
    c7f067f Update vendor/ with new required vndr go.mod files
    8c5779c bump containerd/ttrpc 699c4e40d1e7416e08bf7019c7ce2e9beced4636
    dff7456 Return NotFound error for kill and delete in deleted state.
    5d17ed2 Update cri to 2fc62db8146ce66f27b37306ad5fda34207835f3.
    e5aab17 bump opencontainers/selinux v1.2.2
    dd85aea bump runc v1.0.0-rc8
    5b9bd99 differ: fix deadlock on commit error
    48f4651 Support disabling default setup of shim logger.
    c79c792 bump docker/go-units v0.4.0
    dfa51c9 runtime-v1: kill shim in cleanupAfterDeadShim
    0376dd4 Don't write dumped stacks to file for ETW capture state
    e6fc0ed Convert Windows CI to use Microsoft MCR image urls
    06a3a48 bump containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
    a333dbc Update x/crypto to 88737f569e3a9c7ab309cdc09a07fe7fc87233c3
    0fd0256 bump gocapability
    7718d06 Write stack dump to `os.TempDir()` as well
    a4942ca Fix error on pull hang in CI
    6bcf463 Move to sha-specified test image for nanoserver
    cfb8b55 .mailmap: update Akihiro Suda's email address
    be2cbd0 Access to client's GRPC connection object
    78f3dc4 Allow dumping stacks via ETW capture state
    05dd66b Update go-winio in vendor.conf
    c9059c7 bump mistifyio/go-zfs f784269be439d704d3dfa1906f45dd848fed2beb
    63c7a87 Requeue events in the shim publisher
    fc167f9 Correct PusherFunc helper to match Pusher intf
    a7af3c1 Correct import path in services/server package
    9cc5878 Check task list to avoid unnecessary cleanup.
    97d247c Rename `hrpc` to `tcpServer`
    047348e Add dialer for events service
    ae87730 Improve shim shutdown logic
    a12f836 Use $TEST_RUNTIME for cri test.
    4b3b99e Add support for required plugins.
    4ba756e Fix API forward events for shims
    1a1f8f1 Set nofile to 1048576
    b911ae3 Add tcp service for grpc listeners
    a6f587e Use ttrpc to publish runtime v2 events
    a8a805c Add ttrpc server to containerd
    c93d645 Add GetOOMScore function
    ae5ca81 Refactor mount path check and add comments
    7045801 delete the ingest when any errors happen during resuming status
    dcf6023 Extend release timeline
    d5b770a Introduce 'clean-test' target in Makefile
    2583d9e update gogo/googleapis v1.2.0
    a98df70 update containerd/btrfs af5082808c833de0e79c1e72eea9fea239364877
    aa8dccd update containerd/aufs f894a800659b6e11c1a13084abd1712f346e349c
    ed61d7f bump containerd/zfs and dependencies
    d667628 bump github.com/pkg/errors v0.8.1
    68ef178 bump github.com/BurntSushi/toml v0.3.1
    1978c0b bump gotest.tools v2.3.0, google/go-cmp v0.2.0
    2741dbe contrib: Dockerfile: bump go 1.12
    a84f87d contrib: Dockerfile: add a base stage
    a07e12c contrib: Dockerfile: reformat, and use --no-install-recommends
    ba9e1ea contrib: Dockerfile: use build-arg for go-version
    4754d2a Update image export to support Docker format
    74eb0dc Return event publish errors.
    10cf21d Export ExitStatus init func
    a733587 Update cri to 6d353571e64417d80c9478ffaea793714dd539d0.
    de1da8b Update handling of registry errors
    c0f0b21 Apply PR feedback
    2a5e4c4 Skip rootfs unmount when no mounts are provided
    abfc89c Update CRI to master
    4730088 Update runc to resolve selinux issues
    2d11f5e Regenerate protobufs
    830b029 Update protobuf v1.2.0
    7c1365b bump sirupsen/logrus v1.4.1
    01310ea do not use unkeyed fields in compose literals
    90085a7 Add empty file to prevent build from failing
    8784eb6 Move snapshotters benchmark to a separate package
    adc4fa2 Use pkg/errors for all errors
    c22effb fix parseInfoFile does not handle spaces in filenames
    559dfa5 Add configurable plugin path
    d9526f5 Move CloudFormation template to contrib
    ae04c16 runtime: guard Close() until both streams are complete
    e96ac20 runtime: log IO error when copying output streams
    515be73 Add snapshotters benchmark
    8722966 fix shouldKillAllOnExit check for v2
    fa5f744 fix shouldKillAllOnExit check
    f7f6dd7 test: add custom cgroup test
    2b8df83 bump containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1
    bc6ac08 update opencontainers/runc v1.0.0-rc7
    808b223 Fix race and panic.
    87289a0 devmapper: implement Usage
    010b4da devmapper: implement dmsetup status
    8710940 Windows: Build shim binary from Microsoft/hcsshim
    e16e995 Vendor microsoft/hcsshim@8abdbb82
    5d50b9c Extend adaptImage function with annotations case
    388c8a1 Fastpath opt and ExecProcess loading
    a849664 Windows:ProgramFiles to ProgramData
    6034c19 Windows:Create root/state with ACL
    7361b19 Update Windows lcow differ to set NT VIRTUAL MACHINE\Virtual Machines SID
    4c9b5ef Update vendor github.com/Microsoft/go-winio
    d15832a Address review comments
    8f8fd3c seccomp: whitelist statx syscall
    908b771 Add code to return message field of returned registry errors
    9a8727c Allow to import an image for the default platform only.
    4506eb4 seccomp: whitelist io_pgetevents
    f3ff95a decouple api.ContentServer implementation package from bbolt dependency
    14a0506 ctr: fix image cmd ArgsUsage
    bdd84ab Add additional capability handling opts
    a631796 horten the unix socket path for shim
    b858cfb Makefile: allow overriding package name
    7ca2c3d contrib/nvidia: export helper binary path and list of Nvidia capabilities
    a7aeffc Update mailmap for cgroup authors
    e6ae9cc Shim pluggable logging
    506b815 remotes: add distribution labels to blob data
    b8d40b3 update runc to 2b18fe1d885ee5083ef9f0838fee39b62d653e30
    09cf2a6 Extend metadata images test with fieldpaths for Annotations
    5124f9e Write the Annotations map into the bolt db
    02cc148 Prepare boltutil for reading and writing another map
    1e893b1 devmapper: add no_devmapper build tag
    79248fe Add test for ocispec.Descriptor Annotations
    34f3772 Allow WithNewSnapshot and WithNewSnapshotView to take in snapshotter options.
    aaae811 Update checkpoint opts with runtime handling
    160737d Fix no pivot and keyring opts
    0b711d6 Copy annotations around where necessary
    4d2a26d BUILDING.md: update testing section
    6424a36 ctr/commands/images/push: don't show progress if it is debug mode
    7cfb99a Add content gc ref labels from containers, images, and snapshots
    f0d5dd3 Use unix.SignalNum in ParseSignal on unix platform
    1745951 Vendor golang.org/x/sys d455e41777fca6e8a5a79e34a14b8368bc11d9ba
    e13a4b6 Update the snapshotter docs to refer to the snapshots package for WithLabels.
    2771471 Fix issue with NewFIFOSetInDir with Terminal true
    828f6eb Fix a bug in shim log on Windows that can cause 100% CPU utilization
    c6703d4 Add missing annotations map to Descriptor for gRPC transfer
    d2bec54 Bump cgroups to dbea6f2bd41658b84b00417ceefa416b97
    208957b devmapper: proper cleanup in pool device test
    734989c Update README
    fb80483 docs: Add NAME section in all manpages
    95f0a49 devmapper: rollback thin devices on error
    adf5c64 devmapper: don't create or reload thin-pool from snapshotter
    7efda48 devmapper: more precise way of checking if device is activated
    37cdedc devmapper: add linux tags, fix build
    0c6d194 devmapper: add README and minor fixes
    2218275 devmapper: register plugin
    cec72ef devmapper: add snapshotter
    3a75882 devmapper: add pool device manager
    6e0ae68 devmapper: add snapshotter config
    fcd9dc2 devmapper: add pool metadata
    809e5fd devmapper: add dmsetup
    fe05e4d devmapper: add losetup
    d83e4e9 Vendor Microsoft/[email protected]
    e0d7ed1 Windows: Enable ETW logging
    cbc032e Update go.etcd.io/bbolt to v1.3.2
    5e84069 Update travis to xenial worker
    84a2471 Add runc.v2 multi-shim
    6bcbf88 Move runc shim code into common package
    fd6ac5d Vendor sirupsen/[email protected]
    b553a12 runtime: allow specifying supported platforms with config
    f6ac73d fixing typo and added a missing comment.
    4b3e0a8 metadata: merge snapshot labels with metadata's labels
    88f19a9 Windows: Update stackdump event name
    14f7e52 Unpack should set 0755 when the parent directory doesn't exist.
    a6f43b5 Add website update to release process
    17b2c84 Update supported versions
    b87e9ee Add ExecID for StateResponse
    bfb266a Fix some misspells in helpers_test.go
    dc09ed1 Add image handler wrapper
    a4f7b37 Add support for TaskDelete event on exec in RuntimeV2
    0089567 Stop sending stderr with TTY on Windows
    6a21728 Use defaults package for listing namespace labels
    14eaad0 Update runc to 6635b4f0c6af3810594d2770f662f34ddc15b40d (CVE-2019-5736)
    98766e8 Vendor opencontainers/runtime-spec 29686dbc
    225d9b1 Fix LCOW layer ordering
    0190e5f Removes the oci.test.exe binary.
    525802f Use distribution's reference.ParseDockerRef
    3538174 Bump github.com/docker/distribution to 0d3efadf0154c2b8a4e7b6621fff9809655cc580
    2dacef0 Add shim skeleton code
    59ea134 OCI Modifiers for Windows
    d25007e Add structure documentation for metadata
    823b7a8 Cleanup releases directory
    7bd8dcd Fix potential containerd panic.
    41f5406 Add release documentation
    f014adf readme: fix example for checkpoint
    dfcc594 Fix deadlock in Windows runhcs shim exec
    da2ab86 Add documentation for using namespace labels for configuring defaults.
    952d582 Add a separate lock for pid.
    9777d76 Revert "use state machine management for exec.Pid()"
    3432398 Use labels only when default namespace is provided and prefer given options.
    59432aa Take default runtime and snapshotter from namespace labels
    6629f85 BUILDING: update BUILDING.md
    d7ed403 Add image pull concurrency limit.
    7f5d7ff Update snapshots docs with garbage collector label
    34672d4 metadata/gc: remove the noop-loop for snapshot reference
    6ed293b Fix bug in shim path lookup
    d63099c Allow matching shim path side by side with containerd
    764afa0 Include extension for shim binary format on Windows
    dfebb40 remove excessive []byte(s) conversion
    85aa8ad Move task events to runc v2 shim
    28f8a90 Update cri plugin to 4dd6735020f5596dd41738f8c4f5cb07fa804c5e.
    bb32c0f Revendor github.com/Microsoft/hcsshim v0.8.4
    f444696 Return out of windows signal handler
    26ab393 Use context.Background for `O_NONBLOCK` `OpenFifo`.
    7db5697 unix.UtimesNanoAt now supported on Darwin
    132ee9b fix: linter issue
    6468619 Implement the Runtime v2 Shim async task model for runhcs
    b444d7d Handle additional cleanups from prior PR
    4ef9bf5 Windows: Publish exit status correctly in TaskExit
    90caf6f Windows:NewDirectIOFromFIFOSet
    3aec9e7 bump up runc
    0befa45 Update ttrpc to support context timeout.
    946e402 Update releases files
    c5a8c9f Fix issue in runhcs shim CloseIO
    31616e7 Fix runhcs shim bug in Create with "len(Rootfs) == 0"
    bcd4cc5 Fixes a bug in runhcs shim Exec.Pid
    bc76e01 Update runhcs options to include CRI Sandbox support
    a79879e Add security audit report to README
    dee0945 Fix spurious ttrpc client shutdown error log on success
    64a0046 Update cri-tools to v1.13.0.
    b55c9c6 Update cri to 4b4b2abb2eb19ad6913a6c5d2a6869a0a43a3fc1.
    17b77ae Fix annotation typo errors
    5137fc6 bugfix: support application/octet-stream during pull
    568b5be runtime: add Add/Delete method in PlatformRuntime interface
    7faaa64 fix: miss remove temp file in createSnapshot
    4247f26 metadata: define content sharing policy
    1be86af add test for WithImageConfigArgs
    36e4dc6 Ensure bundle removal is atomic
    723797d docs: remove website leftovers
    d4ecb00 checkpoint: return empty image if checkpointPath exist
    f2344db do not mutate defaults in replaceOrAppendEnvValues
    da9471f fix oci.WithImageConfigArgs for windows
    897afea Revert "Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)"
    0ec6526 Update the delete docs for Runtime V2 on Windows
    e20ba5f test: add test for c/r without image
    4026738 fix ctr image export not found error
    8be05eb Fix freebsd build
    7b1e6f3 fix: use func args instead of build new one
    9baecf6 fix: fix defer in loop
    903abf3 Fix annotation typo error
    52de371 Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)
    2d96aad bugfix: unpack should always set the snapshot gc label
    a2a4241 Add timeout and cancel to shim fifo open
    6f944e4 fix: SCHILY.xattrs should be SCHILY.xattr
    6ccb0d0 fix: remove dead code
    2db0c6c Explicitly stating utf-8 when fetching oauth token
    603e97a ctr/content: make editor flag is required
    7ac221e Adding ctr memory and cpu flags
    822ae18 Update cgroups to 1152b960fcee041f50df15cdc67c29db
    6593399 cr: support checkpoint/restore without image
    fd16bf6 runtimev2: add image-path and work-path for c/r
    83ebcf9 runtimev1: add image-path and work-path for c/r
    c5a0c7f Add build option "GODEBUG=1"

Shortlog since last vendoring of github.com/kata-containers/agent:

    5064045 docs: Add missing document link
    5583acd release: Kata Containers 1.7.0
    5f9df74 updateInterface: enable hot-add nic on arm64
    86ca8e0 vendor: update gogo/protobuf to v1.2.1
    c9343fb release: Kata Containers 1.7.0-rc1
    560dc87 vendor: update vsock package version
    0af7173 agent: support debug console
    d9aa453 proto: add network stats
    3169c9b docs: Fix markdown in TRACING.md
    8aa2880 release: Kata Containers 1.7.0-alpha1
    2ada1d1 agent: Display trace details
    cb32d28 test: Fix mockContainer
    3e12793 agent: Fix container creation
    6e558f7 vendor: Update libcontainer vendoring
    7fbd860 agent: send SIGKILL instead of SIGTERM to container init process
    8847998 agent: Add support for local storage
    8b34aaf make: Add build option STATIC=1 to statically link
    01b1cb2 travis: Use xenial
    d815c97 lint: Update code to handle lint issues
    828b417 ci: Update travis go version from 1.10 to 1.11
    f61ca8a release: Kata Containers 1.7.0-alpha0
    bdf2290 ci: travis: checkout test repo to correct branch
    209aa2f agent: Fix "agent grpc server quits" show wrong error
    2af3599 channel: Check for channel type in kernel cmdline options
    8187461 vendor: use latest github.com/mdlayher/vsock
    39696c0 vendor: Revert "vendor: Update libcontainer vendoring"
    7866668 agent: Revert "agent: Fix container creation"
    8f893b9 test: Revert "test: Fix mockContainer"
    49e5847 systemd-target: Add chronyd.service to kata-containers.target
    0bf9d1e make: Install systemd targets in systemd unit dir
    85e0942 docs: Explain shutdown behaviour with tracing
    99d6118 docs: Define "VM" in tracing doc
    353ec2d service: Fix user initiated shutdown with static tracing

Signed-off-by: lifupan <[email protected]>
(cherry picked from commit 590ed09)
Signed-off-by: Ganesh Maharaj Mahalingam <[email protected]>
zklei pushed a commit to zklei/runtime that referenced this pull request Jun 13, 2019
Since runtime needs to update gogo/protobuf to v1.2.1
to support latest shimv2, in order to keep align with
runtime, update it too.

Shortlog since last vendoring of github.com/gogo/protobuf:

    746e99c merged in golang/protobuf commit aa810b61a9c79d51363740d207bb46cf8e620ed5 - proto: fix handling of required fields after multiple violations
    4f863fb merged in golang/protobuf commit 89a0c16f4dc2a70c0ed864d8ef64878f24fdaa51 - README.md: remove usage of group in example
    2f3f4c2 merged in golang/protobuf commit 7d1b268556d691919f2262240737157830eab632 - jsonpb: avoid unexported fields in hand-crafted message (kata-containers#526)
    f2db49f merged in golang/protobuf commit f5983d50c82d70eaa88c17080245cc871558081f - proto: make invalid UTF-8 errors non-fatal (kata-containers#525)
    7aa71d7 merged in golang/protobuf commit 560bdb64431cc123098c2db67f16053a923a0688 - jsonpb: strictly document JSONPBMarshaler and JSONPBUnmarshaler behavior (kata-containers#524)
    eee5829 merged in golang/protobuf commit 93b26e6a70e37abb14f2f88194949312b0592a84 - protoc-gen-go: refactor generator by splitting up generateMessage
    ad62c6c part of golang's 427e165 commit. Missed removing this file with their test refactor
    efb8d72 merged in golang/protobuf commit 427e165155e0a4ff5993a36657c1f733f5b0f782 - proto: fix and cleanup test for deterministic marshal with custom marshalers
    7143b48 merged in golang/protobuf commit 14aad3d5ea4c323bcd7a2137e735da24a76e814c - jsonpb: avoid copying string-valued map-keys
    48e2601 merged in golang/protobuf commit 1325a051a2753cd67556b182843b1b693d0854cd -  proto: fix quadratic behavior in nested map marshaling (no size caching for stdduration/stdtime)
    bc71a26 merged in golang/protobuf commit f05648d464991ab1aa8cf6a499122c56f0f50f2f - jsonpb: handle map key and value properties properly
    be27d1b merged in golang/protobuf commit 9eb2c01ac278a5d89ce4b2be68fe4500955d8179 - jsonpb: decode int32/uint32/float32/float64 strings
    b43a52d merged in golang/protobuf commit 05f48f4eaf0e05663b562bab533cdd472238ce29 - proto: revert UTF-8 validation for proto2
    808c1f7 merged in golang/protobuf commit 64db29d85ff91ba669cfaf009d5f400a4da8a55f - jsonpb: error on scalar enum provided for repeated enums instead of panic
    07eab6a use only one write in the varint writer when possible (kata-containers#504)
    dd51cd8 fix typo independant to independent (kata-containers#512)
    211a54c Add godocs link to Readme.md (kata-containers#506)
    e87afe3 Fix text unmarshal for (u)int(8/16) fields (kata-containers#498)
    e5d5b02 Codegen for well-known types (kata-containers#489)
    6f222ca reorder some of the protoc paths in order to prefer our protobuf/google/protobuf/*.proto files. This is just to avoid using the wrong protos if you have the same protos in you gopath/src dir. (kata-containers#502)
    fd322a3 fix error: bad Go source code was generated, illegal hexadecimal number (kata-containers#488)
    61dbc13 Jsonpb custom type - kata-containers#411 (kata-containers#491)
    e14cafb Customtype  Warnings and issues  update (kata-containers#479)
    7c690ae Exact slice allocation for repeated packed varints (kata-containers#480)
    4aa4cc2 Adding missing func to CustomType documentation (kata-containers#483)
    5669497 bumped the go version (kata-containers#475)
    64d6d2f added nil check in Proto/Size methods fix kata-containers#444 (kata-containers#451)
    3e657e5 fix for letmegrpc (kata-containers#474)
    3cefc55 options to not generate xxx fields (kata-containers#467)
    4c0a09c updated to go1.11 and removed go1.9 (kata-containers#473)
    2b9e95f merged in golang/protobuf commit 70c277a8a150a8e069492e6600926300405c2884 - Fix unmarshaling JSON object with escaped string into Struct type. (kata-containers#464)
    2f2ea5  Added ProtoSize wrapper functions for the well known types  kata-containers#438 (kata-containers#443)
    5440baf exact slice allocation for fixed size packed fields (kata-containers#437)
    6eaa97b Added gRPC Course on Udemy (kata-containers#434)
    a4c2ffc Update Readme.md
    646de4d Fix typo (kata-containers#441)
    636bf03 fix kata-containers#427 consistent import naming between the import declaration and the vars in grpc
    7d68e88 fix build by regenerating everything
    fae8c2d fix git diff for travis
    2c42fe8 merged 7c4add53b497798e7fd7b204f28e41ab409bdbb7 from golang/protobuf. protoc-gen-go: remove deprecated function in grpc (kata-containers#426)
    ebc0565 merged 3fac2a27c94f99f4379551928df388fcb0ad37ce from golang/protobuf. ptypes: optimize Is to avoid prefix scan (kata-containers#425)
    37f19cd Handle deterministic marshaling for generated marshalers in XXX_Marshal
    67fcf76 Swap type assert and fix it (kata-containers#418)
    30cf7ac gofmt
    6b99319 travis: opt into apt get
    110e410 text: allow customtype to have a Bytes() method (kata-containers#227)
    99cb001 dev: amortize cost of growing a Buffer - merge fae8ec697c5d103f717d7fec21103cb5ec020bc8 from golang/protobuf
    1a0e3bd dev: proto: remove unused writeRaw function - merge d167f5cf056d2db6c0f53f44a3309ac60b99ab5b from golang/protobuf
    99bb9bf dev: Revert "protoc-gen-go: use standard library context (requires Go1.9) - merge bf2da8229df5077275b46b301818c6219ebe1003 from golang/protobuf
    9c8b44c dev: Implement "import public" using type aliases. - merge 6fb5325cf9e4b38b58cef6cd1f60c773cc2d5ad2 from golang/protobuf
    6487871 Expose vanity TurnOnGoRegistration (kata-containers#402)
    b8814cc dev: protoc-gen-go: fix generation of proxy getters for distant types - merge 9bb87600c289706cc58f76b46a91b05ddd2a44d8 from golang/protobuf
    9ddc509 dev: protoc-gen-go: fix up generation of package names - merge 3b4abe1a0672c5916c1937b8817dde8aeb579fe5 from golang/protobuf
    cbb7298 dev: protoc-gen-go: revert some API changes - merge 06c268a946d24fdcb0b59370c36ab876ece17556 from golang/protobuf
    8a67e47 dev: proto: do not allow unknown fields to satisfy required field bit - merge 91cccdb44a5fc8dfdf368e8b4d517a21de94dce9 from golang/protobuf
    265a302 dev: protoc-gen-go: Dont rely on local package name for mset name hack - merge 9c8fb7a95075eb047ab75e702de52f68ff360f17 from golang/protobuf
    00f8f1f dev: proto: ignore unknown fields in map entries - merge b028a76c61b7288aefe6746ab7b561d7eb15ab71 from golang/protobuf
    90d0c2a dev: conformance: remove useless variable declaration - merge conformance: remove useless variable declaration from golang/protobuf
    60491a7 dev: conformance: clean up, fix conformance tests - merge ab964bf603354327027b1974c2d1a199ce839899 from golang/protobuf
    9f8212a dev: protoc-gen-go: fix generation of public imports -merge 80c8f764516eebbf17174ea9fd61601d6a52f0f6 from golang/protobuf
    3860157 dev: Reduce a bunch of generated code in oneof sizers. - merge d0dc0def2e8a155b703a9b4966ca8f803ce06308 from golang/protobuf
    e41f35d protoc-gen-go: dont generate blank // import comment - merge b244a785444d0c500df2e0c6b968c05531365a00 from golang/protobuf
    6764c01 dev: golden_test: normalize path separators for Windows - merge 12a586e0adaf626e5d2f8da7881f321f076dbe2c from golang/protobuf
    e844e5c dev: protoc-gen-go: use standard library context (requires Go1.9) - merge 3dc8a89f965ba7bf716fd0d92b83c5da1792ab9c from golang/protobuf
    dfaf7a7 dev: protobuf: Delete makefiles, regenerate protos consistently - didnt merge everything, left Makefiles, but made the other small changes - merge 251359bf9d6712b0aefe759977c168b79d1f3a27 from golang/protobuf
    828b125 dev: protoc-gen-go: fix test - merge 2b3479d8d7175442fbfd46f4ba5c14d971aeb521 from golang/protobuf
    f5a1220 dev: protoc-gen-go: add paths=source_relative option - merge 6fb8a6f1c1f011b7fde2b40f72f46587180d8d25 from golang/protobuf
    214eb97 dev: fix golden tests for older protoc versions
    aa7e6f4 dev: protoc-gen-go: handle package import names per-file - merge 9d4962b4dc40a899c435fe1aaec48e683b4300ef from golang/protobuf
    08f8895 dev: protoc-gen-go: add test for various generation params - merge a1987161d42e479a8a593d7f66ff1be81574b1e0 from golang/protobuf
    d178c98 dev: protoc-gen-go: dont depend on input file ordering - merge f4733c73b342d1d1a07fda684e831f77f840a688 from golang/protobuf
    253b333 dev: protoc-gen-go: add more golden tests for imports - merge 15c34729da28f0a8c71325b8ee35ef19362290e6 from golang/protobuf
    100bcd0 dev: Rename generated Marshal and Unmarshal protobuf method - merge 60f8421f4063f411270d0527ca77697eb9f29f1e from golang/protobuf
    26c4e69 dev: protoc-gen-go: remove relative import in main_test.go - merge protoc-gen-go: remove relative import in main_test.go from golang/protobuf
    5f4a927 dev: protoc-gen-go: include canonical import comment - merge 1021ee9d478ac35478bd39859883102741f9c4c1 from golang/protobuf
    9c3ad97 dev: proto: avoid pointer arithmetic with invalidField - merge 649500c21ecd283d00f78859ac2f386df8ed2c96 from golang/protobuf
    e23e1bc dev: no more generated package doc - merge efae459c9350a60c1f8f503f34e3cb67f803a617 from golang/protobuf
    8b846a8 dev: Merge pull request kata-containers#520 from neild/dev.alias + Fix top-level Makefile to descend into protoc-gen-go. - merge 04869ad56b1a4eb4179ceadb8a1b787a9ce4b0a3, 8cbe6f4e7d1aa3a63d2ae35cf9e9eaa1aa4c6876, 025a21d09bcd80bade5d4d6c1fb7026dcf1056dd, f7e61e16d550efe3e664c64e8ef42b624b408643, 055d7b0dba6f8ba91c7e12e4f9cc891ba607f4e7, b322e49f0e384b8e162e1f55cdeedfbba461269c + 2c2f6de12273f767388d4f3aebf6306ae3a9c7cb from golang/protobuf
    2c90c88 upstream: add back proto.Sizer
    754b8fa dev: proto: treat bad wire types as unknown fields - merge e6af52bec88380a7a18ecc0977fa4312370a970b from golang/protobuf
    0091a58 dev: jsonpb: skip unexported or non-protobuf fields - merge 42d4f477264bec37ad9b729039d071eaedd32d9b from golang/protobuf
    504621d dev: protoc-gen-go: indicate deprecated fields in documentation - merge da3e23721ffb60cccccdef6dfaef948bce1ad9d7 from golang/protobuf
    5db6fbe dev: proto: support purego build tag - merge 9a84eb8532beb2edb9dfbd6a2d823e696b57b450 from golang/protobuf
    e1d2528 dev: proto: robustify tests that compare error messages - merge 57af8637f022e8bf7f313f6156d9873b7f5ebaba from golang/protobuf
    6026053 dev: proto: remove Proto3UnknownFields flag - merge b409cc5837a65fa96edf2a5e4f1ec2ccf0cc31a8 from golang/protobuf
    81f6217 dev: proto: reject invalid UTF-8 in strings - merge 35253352f94915c119f607b2cac4ef87bd3b085b from golang/protobuf
    4192d1c dev: proto: add logic to handle legacy message - merge 10c2d9d3cccc103717e4e5dc6c503fefc8a33dea from golang/protobuf
    9806df0 dev: jsonpb: change Marshal to trim timestamp/duration to 0 fractional digits if possible - merge f9bf3fbed3136fa83399f35204bf39644e205a30 from golang/protobuf
    a30fc23 dev: jsonpb: fix handling of illegal and negative nanoseconds - merge ac606b176499a528828d10c85583a7c3107939f6 from golang/protobuf
    b34bdd4 dev: proto: expose accessors for raw value of extensions - merge 5f34c20e59ed64239722b4215413f1ffd1efa9de from golang/protobuf
    54b14bf dev: Remove raw interface - merge 7d76aa1a8129e37aae7c421a64e04a4ced5ef1ac from golang/protobuf
    5f21c7a dev: Use fmt.Errorf instead of errors.New - merge 572071ce41835e834277d132bd34f72baa4754cc from golang/protobuf
    5028789 dev: jsonpb: change Marshal/Unmarshal to return error if any required field is not set - merge 2bc5431dca4a5134e05a24d7b874cd189e934a38 from golang/protobuf
    b56d376 dev: Cleanup comments and whitespace - merge 575152efd80e5accf3969091e05f9ec30b35a2f2 from golang/protobuf
    761ef94 dev: jsonpb: check for nil in Marshal and return error to avoid panic. - merge 49f2ba7d08e875af9b5f3bd5d2f29d5fb1ca86b1 from golang/protobuf
    88bd217 dev: Simplify code - merge 5c7dd3329b568cef186709cadf093cad82f8fdfc from golang/protobuf
    d2459a7 dev: Fix uint64->int overflow in table unmarshal - merge 1ec9e17d4d187ddb55cc9858887b2202b3f75707 from golang/protobuf
    b559abf dev: Correct some mistakes - merge 013f295b1c740bd8ca5ce84ea810940b1945fcb0 from golang/protobuf
    5ec47c3 dev: Remove unused code - merge 3ffccb49d84ed0b9eb1e518dd391a6d015adfeb4 from golang/protobuf
    44af720 Upstream (kata-containers#399): Merging upstream from golang/protobuf into dev branch golang/protobuf@8cc9e46
    1ef32a8 messagename
    49944b4 grpc error usage article
    58efb20 add mentions from Johan Brandhorst
    1d2310f merge bbd03ef6da3a115852eaf24c8a1c46aeb39aa175 from golang/protobuf
    ac06767 upgrade to go1.10
    9b87cea fix build for gopherjs that now requires go 1.10
    a74c03e fix build
    1ae71f0 fix for issue 389: importing of customtypes that are messages should not cause another import for the original message
    d5bc08a Update Readme.md
    f8f204f add new user : go-spacemesh
    b75782e protoc-min-version don't suppress protoc stdout and stderr out on success. (kata-containers#381)
    73bcffa Update Readme.md
    43a6153 More well known types (kata-containers#378)
    ff3a3b6 Added link to new blog post in README (kata-containers#375)
    1adfc12 merge 925541529c1fa6821df4e44ce2723319eb2be768 from golang/protobuf
    26de2f9 Added instructions for using proto files from google/protobuf (kata-containers#371)
    160de10 another user: zero stor
    d4d8b59 Update to protobuf 3.5.1 and minor cleanups for Golang 1.10 (kata-containers#363)
    35b81a0 Test with latest Go and protobuf patch versions. (kata-containers#352)
    aee20e7 plugin/equal: "return this == nil" to satisfy gosimple linter
    620da83 plugin/populate: avoid loops on non top-level packages
    cc007c0 example
    cd5e432 Incorporate review comments
    c4bc39e Mentioning the bit about proto_path up front
    ff2773e Ensure v3 to compile importduplicate.proto
    e683811 Minor update to the comment.
    bf3b9f4 Fix issue when provided f!=nil
    563235a Fix duplicate import names when same name used in different contexts
    3813b83 fix for testdata/my_test
    685a9b3 Test duplicate import names from proto package and generated code.
    b0a8a05 Removed unsafe stuff that got readded; regenerated .pb.go files
    8ddeac9 Update generated test files.
    c9c3a74 Update gogoproto/Makefile.
    f646b88 Review feedback
    b1c3a66 Add go_package
    7eaf46c min version 3 for my_test/test.proto
    3db9d03 Grammar Issues
    0c5dcd7 Update extensions.md
    acc574d merged 130e6b02ab059e7b717a096f397c5b60111cae74 from golang/protobuf
    2e9fe32 updated descriptor
    7cc42a6 merged 11b8df160996e00fd4b55cbaafb3d84ec6d50fa8 from golang/protobuf
    04380c3 merged 17ce1425424ab154092bbb43af630bd647f3bb0d from golang/protobuf
    92733a0 merged 5afd06f9d81a86d6e3bb7dc702d6bd148ea3ff23 from golang/protobuf
    79e6522 Revised comment regarding the uniqueness of package names.
    44008aa Regenerated pb.go files.
    48a47cb Fixed double import prefix issue.
    874a222 Fixed misleading comment.
    c59a8c7 Readded alias name to import statements.
    3ae4cfd Fix to avoid printing import alias when same as import path suffix.
    ca6d352 Fix to avoid long import alias names when not needed.033462 merge in golang/protobuf commit 3a3da3a4e26776cc22a79ef46d5d58477532dede - proto: mention field name in error message (kata-containers#616) (kata-containers#465)
    98f6aa8 added license details to Readme.md (kata-containers#469)
    e66941c Update Readme.md (kata-containers#468)
    476a2e9 Set defaults on nonnullable fields (kata-containers#435) (kata-containers#459)
    5e81640 removed the GOPATH env dep in the makefile protopath (kata-containers#461)
    7af9d32 Fix nullable extension issues for non generated code (kata-containers#453)
    888d305 merge in golang/protobuf commit d7d60bc05d9f92d4692aa196ac022618c2d86655 - grpc: fix and improve interface comments for client/server types (kata-containers#604)
    a4350c5 merge in golang/protobuf commit 668a607657a5d387d6333648a2d9c749761fdc69 - LICENSE: Move title to README.md
    8599525 merged golang/protobuf commit 927b65914520a8b7d44f5c9057611cfec6b2e2d0 - proto: adjust documentation on RequiredNotSetError (kata-containers#603)
    8e3eb24 Fix wrong build tags (kata-containers#445)
    797fbbb merged commit 32a84b27e28ab9f681f0df16160c4ef1f6587094 from golang/prb

Fixes:kata-containers#555

Signed-off-by: lifupan <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants