This repository has been archived by the owner on May 12, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 113
Backports for 1.8 #604
Merged
egernst
merged 2 commits into
kata-containers:stable-1.8
from
egernst:backports-for-1.8
Jul 18, 2019
Merged
Backports for 1.8 #604
egernst
merged 2 commits into
kata-containers:stable-1.8
from
egernst:backports-for-1.8
Jul 18, 2019
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/test |
/test |
This updates openconatainer/runc (and its deps). Ref. opencontainers/runc#2065, running a version before that fix will result in some strange behavior on Aarch64 (Linux 5.0.X+). This fixes kata-containers#596 Changes in opencontainers/runc: 652297c7 Update dependency libseccomp-golang 6770c869 Allow to define `COMMIT` by env b54fd85b libcontainer: change seccomp test for clone syscall 6f77e35d Export list of HugePageSizeUnits c6445b1c Add tests for GetHugePageSize 273e7b74 Fix cgroup hugetlb size prefix for kB 65032b55 libcontainer: fix TestGetContainerState to check configs.NEWCGROUP 8383c724 main: not reopen /dev/stderr 46351eb3 Move systemd.Manager initialization into a function in that module 62bd2593 VERSION: back to development 425e105d VERSION: release 1.0.0-rc8 8362cd02 Vendor in latest selinux code for keycreate errors a1460818 Write logs to stderr by default 68b4ff5b Simplify bail logic & minor nsexec improvements 17b37ea3 libcontainer: intelrdt: add missing destroy handler in defer func 475aef10 Remove redundant log function ba3cabf9 Improve nsexec logging da5a2dd4 `r.destroy` can defer exec in `runner.run` method. 8296826d specconv: always set "type: bind" in case of MS_BIND c486e3c4 Address comments in PR 1861 feebfac3 Remove pipe close before exec. 9a599f62 Support for logging from children processes 3e6688f5 add selinux label for runc exec dcf994b4 Fix SELinux failures on disabled SELinux Machines 6b5ee713 VERSION: back to development 69ae5da6 VERSION: release v1.0.0-rc7 eab53309 Fixes regression causing zombie runc:[1:CHILD] processes cd96170c Need to setup labeling of kernel keyrings. Changes in seccomp/libseccomp-golang 689e3c1 all: Update CHANGELOG for v0.9.1 0353a0b golang: Add ActLog test 798ec96 golang: Add support for SCMP_ACT_LOG 23edf06 golang: Add filterAttrLog getter/setters test 4b17538 golang: Add support for SCMP_FLTATR_CTL_LOG 62d5d2b golang: Add API level bindings f6ec81d golang: add more info to errors with fmt.Errorf() da59163 golang: Fix unit test failures on 32-bit systems 84e90a9 golang: Fix compile error on Debian 06e7a29 golang: Resolve bug with handling of multiple argument rules fc02980 golang: Remove TSync functions, and set unconditionally 9814e55 golang: Use `seccomp_version` API to obtain library version Changes in sirupsen/logrus: 839c75f Release 1.4.2 744fc4c fix build break for plan9 f2849a8 add full cross compilation in travis (#963) 1bc909a Add a checkTerminal for nacl to support running on play.golang.org 1a601d2 remove go 1.10 from ci build matrix 5521996 Update x/sys/unix to fix AIX support c1b6154 Fix solaris build 8bdbc7b Release 1.4.1 6c615e1 remove field if val is empty string for func and file field in text formatter ede5b63 Make isTerminal un-exported 3e06420 Move files to main directory 38bc297 return new entry for Entry.WithContext 7d700cd Test more platforms c49ef1d Move terminal package 5d8c3bf Updated travis.yml 41ee4dd Moved moved unix-related parts into terminal 7de3dd8 Removed golang.org/x/crypto refs 10ff0d0 Got rid of IsTerminal call to reduce external dependencies c076594 Add Go 1.12 to Travis CI build matrix 02141df Add CHANGELOG for v1.4.0 68e41f6 Add WithContext cf1b9fd fix sync.Once usage instead of adding a mutex lock b9d4514 fix ReportCaller race condition 99a5172 Add and example for CallerPrettyfier 5c2b39a Remove debug trace ffec2f2 Add a CallerPrettyfier callback to the text formatter 5e9b246 Add a CallerPrettyfier callback to the json formatter 4f5fd63 Fix infinite recursion on unknown Level.String() c4e4882 prevent string formatting in Entry.Logf when log level is not enabled 774bb8e Fix error formatting based on best practices from Code Review Comments 4ea4861 Add a DeferExitHandler function 68a2b57 Add nested-logrus-formatter to README.md f61e48b logger: fix wrong callback method 0f544bf Add a unit test to ensure hook are called in their registration order a99ca47 Add an example hook which adds default fields 78fb385 Remove unused variables in TextFormatter eef6b76 Update Changelog for 1.3.0 bd9534b Test Log e8fd0ba Remove sensitivity to file line changes ff695da Implement TextUnmarshaller interface for Level type a6668e7 Add Generic Log functions with level via argument 9abefb9 do not clear error formatting informative field d962013 respect ForceColor and environment variables over OS check 08e8d65 Skip func pointer type value in fields 0c5e33c Travis: fix checkout dir to help contributors run Travis on their fork f1b98e4 ignore expected color on windows e902658 Disable colored output on windows entirely eab2c44 fix hook example c7183bf fix missing parameter 2cafb78 fix race condition caused by writing to entry.Data, using the same technique as JSONFormatter bcd833d v1.2.0 changelog d10c2f9 fix panic in text formatter 5a78c38 make file name comparison os independant d2654b7 add file and line number in output when report caller is enabled fa01b53 move test functions and test utils functions in their own package ec57031 store a runtime.Frame in Entry instead of the caller function name 975c406 Use a sync.Once to init the reportCaller data 5fcd19e add a SetReportCaller on Logger object 0c52582 Add GELF to third party formatters 5c1f2cd Make logrus.Level implement encoding.TextUnmarshaler bb98c6c Fix the version of windows coloring library dependency ed3ffa0 PR#844: Added Trace to TestLogLevelEnabled() (requested by @dgsb) b54cafe Addresses @stevvooe's backward compatibility concerns. ef9d84e Added trace log level. c7a33dc Add Trace level logging 4981d81 Added TRACE level logging. 9c7692c disable colors on hook example f2ab87f Add an example for tracing global variable with hook ff92509 Attempt to fix build break on aix a13c5db Fix typo in comment 4346c76 Remove unnecessary wrapper function on `os.Exit` 99bc300 Add a method Exit on Logger that calls `os.Exit` or alternate exit function. ad15b42 Update changelog for v1.1.1 release 3f90cee Rationalize os specific build constraints 2be6202 Add option to panic in `test.NewNullLogger` to allow testing of calls to `Fatal*` 7b467df Skip func type value in fields. a67f783 Update changelog for v1.1.0 release 73bc94e Add custom sorting function in text formatter 5a88d3c Add missing module dependency for windows build 629982b DisableColors in two tests to fix AppEngine configuration 0a8fc8d Add AppEngine test configurations to travis to a void regression f1ce1ba Fix copypasta 90501cf Fix AppEngine builds 98c898c Fix gopherjs build constraint name eed7c22 Fix travis build for go 1.11 with modules 66895ce Fix module name and remove unused dependencies 88eb166 Fix spelling in Entry.Buffer comment f75951b Add go module support 4bcb47b commit to trigger appveyor build 8b12043 Fix example build on windows 7556e24 Use syslog instead of airbrake as syslog example e58aa84 bump go toolchain version in travis 98d0f31 Add previously forgotten v1.0.6 description in changelog 90bf2e7 feat(LogLevel): taking in account code review from David Bariod 13d10d8 return old hooks from RelplaceHooks 7a0120e logger.ReplaceHooks b5e6fae Cleanup on unit test on isColored cadf2ce Add unit test for TextFormatter.isColored eb968b6 Fix for CLICOLOR_FORCE handling 8a6a17c Fixed missing brace after wrong merge d950ecd Remove unnecessary text_formatter file da39da2 Keep terminal check naming convention 37d651c Add CLICOLOR support 179037f Ensure a new entry data fields are empty d316277 Add logger benchmark 54db2bb limit the build/test matrix to the two latest stable version 6999e59 properly fix the hooks race test 725f3be Adds WithTime to Logger and Entry types, as well as a pure module-level function. 52b92f5 Allows overriding Entry.Time. fc9bbf2 [kata-containers#241] Allow to set writer during logger usage. eed1c0f Fix GopherJS build tags 2ce6c0c Support for Entry data under nested JSON dictionary. 6b28c2c error message 5d60369 Fixed prefixFieldClashes for TextFormatter and added coverage 4225d69 feat: new methods to check enabled log level 070c81d Revert the change introduced in kata-containers#707 and do the proper fix. Fixes #_729 098a5a7 Move the hook services list to a wiki page caed59e Fix Logger.WithField doscription aa6766a PERF: use buffer pool in json formatter b1e82be Update go versions in travis configuration. 8369e2f Fix a race condition in TestLoggingWithHooksRace 507c822 add mysql hook e63a8df added Anexia CloudLog to list of hooks 5513c60 Improve documentation for Fatal* class functions 2f58bc8 Unified terminal initialization code handling 9bc59a5 Fixed initTerminal() was run for non-terminals cf5eba7 Simplified file structure c9a46a1 Added terminal check on Windows 7d2a521 Extended conditions to include non-native builds f142d81 Improved building of non-windows code bb487e0 Added support for text coloring on Windows 10 19b9c9e delete dead link b537da5 Fix run-on sentence 723dd3c changed prettyprinting to use spaces as opposed to /t c155da1 changelog: add 1.0.5 91b159d Add Kafka REST Proxy hook to README c840e59 add gopherjs build tag 1893e9a Fixed: comment f4118d2 reamde: add logrus-clickhouse-hook efab7f3 Have prefixFieldClashes respect the JSON FieldMap be56909 Make fireHooks() method receive a copy of Entry structure to avoid race conditions 178041e Fix typo in README.md 828a649 rename fieldLogger to entry eeb6535 Lock mutex before formatting to avoid race efbfdb5 Add failing test for using a FieldLogger with hooks inside goroutines 0cf9f0b Made text consistent with other hooks 516f6c1 Add Application Insights hook to README 977e033 Fix deadlock on panics at Entry.log 92aece5 TextFormatter behaviour aligned with stdlib log (fixes #_167) eb15690 remove .gitignore changes and update AddHook 20cc8e2 remove .gitignore changes 0c03a05 mirror and wrap Logger instance methods in exported.go d682213 changelog: 1.0.4 b9eceae fix example bf1fb70 Add FieldMap support to TestFormatter 73a1342 Fix typo in README.md 10d6a5b removed useless line from readme 639325f added pretty print option for json logs 9700beb Update README.md 1858a85 Adds `logbeat` hook to README c44d524 Fix typo in docstring 4844e58 Add promrus to list of hooks. 7d3ddc6 Split terminal check to add build tags to support App Engine. cd1114d Added reference to AzureTableHook 9bc52e3 Fix test assertion c830992 Take lock on mutex when firing hooks 66230b2 Add test for race condition in hooks 3d1341c Add AddHook method for logger 5efed00 Update README.md to fix link to Kafka hook 3bd397e Add Telegram hook to README.md. e3d1776 MD formatting 9ce1c9e add github path to log message in readme b1db1b9 regex assertion rather than literal, for github path 3cb9e18 test updates bc6d984 add caller logic to DisableTimestamp case 1f59c9a Add DisableLevelTruncation description to README 88dd8df responses to code review d8fd234 add syntax hilighting to new example blocks 2e7c40e README formatting tweak 802fba1 add note on caller-reporting overhead to README 306956c tweak timing tests to handle slower VMs and older GoLang 65f3af3 simplify hasCaller check a5c845c responses to review comments 4575b7a revert slight added complexity in NewEntry() 05a8f4d fix test description 348bace doc updates, and relabel ReportMethod 1e21450 push compilation even higher, to reduce to one call 8161d93 performance: precompile regex before iterating 473c344 Add README notes and CHANGELOG entries 93af604 First cut at adding calling method e5b6713 Added testing for DisableLevelTruncation 7a1f601 Added ability to disable level text truncation. Fixes #_406 Signed-off-by: Odin Ugedal <[email protected]>
This is introduced as a transitive dependency for the runtime and causes vendored pacakges to break as the change in the runtime-spec introduces a backward incompatible change for dependent packages. Fixes kata-containers#597 Signed-off-by: Archana Shinde <[email protected]>
jodh-intel
approved these changes
Jul 17, 2019
Codecov Report
@@ Coverage Diff @@
## stable-1.8 #604 +/- ##
==============================================
+ Coverage 50.54% 50.62% +0.08%
==============================================
Files 17 17
Lines 2392 2392
==============================================
+ Hits 1209 1211 +2
+ Misses 1027 1026 -1
+ Partials 156 155 -1 |
GabyCT
approved these changes
Jul 17, 2019
marcov
pushed a commit
to marcov/kata-agent
that referenced
this pull request
Jul 19, 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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A couple of patches for vendoring were introduced since RC0.
Both look like fixes (one redo of runtime-spec update, one runc update to fix aarch64 issues). I don't like changing vendoring after RC, but these look necessary:
9f4bd32 vendor: Move to a previous version for runtime-spec vendor
450722a vendor: update dependency opencontainers/runc
/cc @amshinde for ACK, please