diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2015-08-21 11:18:45 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-08-21 11:18:45 -0700 |
| commit | b0f661181d10bddc08e380992590a1cdd92be92b (patch) | |
| tree | d9291cf324a72206ae3e474fe49186e8c96b2a9e /src/google/protobuf/any.proto | |
| parent | d119a275495b7dcc9c389c9c650ebd83de265511 (diff) | |
Down-integrate from internal branch.
Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
Diffstat (limited to 'src/google/protobuf/any.proto')
| -rw-r--r-- | src/google/protobuf/any.proto | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/google/protobuf/any.proto b/src/google/protobuf/any.proto index e1780fe5..c1a0bccc 100644 --- a/src/google/protobuf/any.proto +++ b/src/google/protobuf/any.proto @@ -42,10 +42,8 @@ option objc_class_prefix = "GPB"; // `Any` contains an arbitrary serialized message along with a URL // that describes the type of the serialized message. // -// The proto runtimes and/or compiler will eventually -// provide utilities to pack/unpack Any values (projected Q1/15). -// -// # JSON +// JSON +// ==== // The JSON representation of an `Any` value uses the regular // representation of the deserialized, embedded message, with an // additional field `@type` which contains the type URL. Example: @@ -93,10 +91,6 @@ message Any { // Schemas other than `http`, `https` (or the empty schema) might be // used with implementation specific semantics. // - // Types originating from the `google.*` package - // namespace should use `type.googleapis.com/full.type.name` (without - // schema and path). A type service will eventually become available which - // serves those URLs (projected Q2/15). string type_url = 1; // Must be valid serialized data of the above specified type. |