aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/util/internal/testdata/maps.proto
Commit message (Collapse)AuthorAge
* protostream_objectwriter: fix bug when Any is directly embedded in a map.Gravatar Harvey Tuch2018-06-21
| | | | | | | | | | This came up when trying to round-trip the JSON<->proto3 conversion for Envoy's envoy.admin.v2alpha.ConfigDump (https://github.com/envoyproxy/envoy/blob/b903c1dc984593f8e95e0569c1503dc5d85fbe34/api/envoy/admin/v2alpha/config_dump.proto#L29). Validated fix on the Envoy code base and via the provided unit test. Signed-off-by: Harvey Tuch <htuch@google.com>
* Integrate internal changesGravatar Bo Yang2016-10-10
|
* Integrate from google internal.Gravatar Jisi Liu2016-01-29
| | | | | Java files are moved to un-do the hack in the prevous commit, which moved the java files to the original position for integration.
* Down-integrate from internal code base.Gravatar Feng Xiao2015-06-15
[ci skip] Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-10 07:38:17 +0000