@@ -127,7 +127,7 @@ github.com/containerd/console                       0650fd9eeb50bab4fc99dceb9f2e

 github.com/containerd/go-runc                       7d11b49dc0769f6dbb0d1b19f3d48524d1bad9ad

 github.com/containerd/typeurl                       2a93cfde8c20b23de8eb84a5adbc234ddf7a9e8d

 github.com/containerd/ttrpc                         f02858b1457c5ca3aaec3a0803eb0d59f96e41d6

-github.com/gogo/googleapis                          08a7655d27152912db7aaf4f983275eaf8d128ef

+github.com/gogo/googleapis                          d31c731455cb061f42baff3bda55bad0118b126b # v1.2.0

 # cluster

 github.com/docker/swarmkit                          59163bf75df38489d4a10392265d27156dc473c5

new file mode 100644

@@ -0,0 +1,203 @@

+Apache License

+                           Version 2.0, January 2004

+                        http://www.apache.org/licenses/

+

+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

+

+   1. Definitions.

+

+      "License" shall mean the terms and conditions for use, reproduction,

+      and distribution as defined by Sections 1 through 9 of this document.

+

+      "Licensor" shall mean the copyright owner or entity authorized by

+      the copyright owner that is granting the License.

+

+      "Legal Entity" shall mean the union of the acting entity and all

+      other entities that control, are controlled by, or are under common

+      control with that entity. For the purposes of this definition,

+      "control" means (i) the power, direct or indirect, to cause the

+      direction or management of such entity, whether by contract or

+      otherwise, or (ii) ownership of fifty percent (50%) or more of the

+      outstanding shares, or (iii) beneficial ownership of such entity.

+

+      "You" (or "Your") shall mean an individual or Legal Entity

+      exercising permissions granted by this License.

+

+      "Source" form shall mean the preferred form for making modifications,

+      including but not limited to software source code, documentation

+      source, and configuration files.

+

+      "Object" form shall mean any form resulting from mechanical

+      transformation or translation of a Source form, including but

+      not limited to compiled object code, generated documentation,

+      and conversions to other media types.

+

+      "Work" shall mean the work of authorship, whether in Source or

+      Object form, made available under the License, as indicated by a

+      copyright notice that is included in or attached to the work

+      (an example is provided in the Appendix below).

+

+      "Derivative Works" shall mean any work, whether in Source or Object

+      form, that is based on (or derived from) the Work and for which the

+      editorial revisions, annotations, elaborations, or other modifications

+      represent, as a whole, an original work of authorship. For the purposes

+      of this License, Derivative Works shall not include works that remain

+      separable from, or merely link (or bind by name) to the interfaces of,

+      the Work and Derivative Works thereof.

+

+      "Contribution" shall mean any work of authorship, including

+      the original version of the Work and any modifications or additions

+      to that Work or Derivative Works thereof, that is intentionally

+      submitted to Licensor for inclusion in the Work by the copyright owner

+      or by an individual or Legal Entity authorized to submit on behalf of

+      the copyright owner. For the purposes of this definition, "submitted"

+      means any form of electronic, verbal, or written communication sent

+      to the Licensor or its representatives, including but not limited to

+      communication on electronic mailing lists, source code control systems,

+      and issue tracking systems that are managed by, or on behalf of, the

+      Licensor for the purpose of discussing and improving the Work, but

+      excluding communication that is conspicuously marked or otherwise

+      designated in writing by the copyright owner as "Not a Contribution."

+

+      "Contributor" shall mean Licensor and any individual or Legal Entity

+      on behalf of whom a Contribution has been received by Licensor and

+      subsequently incorporated within the Work.

+

+   2. Grant of Copyright License. Subject to the terms and conditions of

+      this License, each Contributor hereby grants to You a perpetual,

+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

+      copyright license to reproduce, prepare Derivative Works of,

+      publicly display, publicly perform, sublicense, and distribute the

+      Work and such Derivative Works in Source or Object form.

+

+   3. Grant of Patent License. Subject to the terms and conditions of

+      this License, each Contributor hereby grants to You a perpetual,

+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

+      (except as stated in this section) patent license to make, have made,

+      use, offer to sell, sell, import, and otherwise transfer the Work,

+      where such license applies only to those patent claims licensable

+      by such Contributor that are necessarily infringed by their

+      Contribution(s) alone or by combination of their Contribution(s)

+      with the Work to which such Contribution(s) was submitted. If You

+      institute patent litigation against any entity (including a

+      cross-claim or counterclaim in a lawsuit) alleging that the Work

+      or a Contribution incorporated within the Work constitutes direct

+      or contributory patent infringement, then any patent licenses

+      granted to You under this License for that Work shall terminate

+      as of the date such litigation is filed.

+

+   4. Redistribution. You may reproduce and distribute copies of the

+      Work or Derivative Works thereof in any medium, with or without

+      modifications, and in Source or Object form, provided that You

+      meet the following conditions:

+

+      (a) You must give any other recipients of the Work or

+          Derivative Works a copy of this License; and

+

+      (b) You must cause any modified files to carry prominent notices

+          stating that You changed the files; and

+

+      (c) You must retain, in the Source form of any Derivative Works

+          that You distribute, all copyright, patent, trademark, and

+          attribution notices from the Source form of the Work,

+          excluding those notices that do not pertain to any part of

+          the Derivative Works; and

+

+      (d) If the Work includes a "NOTICE" text file as part of its

+          distribution, then any Derivative Works that You distribute must

+          include a readable copy of the attribution notices contained

+          within such NOTICE file, excluding those notices that do not

+          pertain to any part of the Derivative Works, in at least one

+          of the following places: within a NOTICE text file distributed

+          as part of the Derivative Works; within the Source form or

+          documentation, if provided along with the Derivative Works; or,

+          within a display generated by the Derivative Works, if and

+          wherever such third-party notices normally appear. The contents

+          of the NOTICE file are for informational purposes only and

+          do not modify the License. You may add Your own attribution

+          notices within Derivative Works that You distribute, alongside

+          or as an addendum to the NOTICE text from the Work, provided

+          that such additional attribution notices cannot be construed

+          as modifying the License.

+

+      You may add Your own copyright statement to Your modifications and

+      may provide additional or different license terms and conditions

+      for use, reproduction, or distribution of Your modifications, or

+      for any such Derivative Works as a whole, provided Your use,

+      reproduction, and distribution of the Work otherwise complies with

+      the conditions stated in this License.

+

+   5. Submission of Contributions. Unless You explicitly state otherwise,

+      any Contribution intentionally submitted for inclusion in the Work

+      by You to the Licensor shall be under the terms and conditions of

+      this License, without any additional terms or conditions.

+      Notwithstanding the above, nothing herein shall supersede or modify

+      the terms of any separate license agreement you may have executed

+      with Licensor regarding such Contributions.

+

+   6. Trademarks. This License does not grant permission to use the trade

+      names, trademarks, service marks, or product names of the Licensor,

+      except as required for reasonable and customary use in describing the

+      origin of the Work and reproducing the content of the NOTICE file.

+

+   7. Disclaimer of Warranty. Unless required by applicable law or

+      agreed to in writing, Licensor provides the Work (and each

+      Contributor provides its Contributions) on an "AS IS" BASIS,

+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

+      implied, including, without limitation, any warranties or conditions

+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

+      PARTICULAR PURPOSE. You are solely responsible for determining the

+      appropriateness of using or redistributing the Work and assume any

+      risks associated with Your exercise of permissions under this License.

+

+   8. Limitation of Liability. In no event and under no legal theory,

+      whether in tort (including negligence), contract, or otherwise,

+      unless required by applicable law (such as deliberate and grossly

+      negligent acts) or agreed to in writing, shall any Contributor be

+      liable to You for damages, including any direct, indirect, special,

+      incidental, or consequential damages of any character arising as a

+      result of this License or out of the use or inability to use the

+      Work (including but not limited to damages for loss of goodwill,

+      work stoppage, computer failure or malfunction, or any and all

+      other commercial damages or losses), even if such Contributor

+      has been advised of the possibility of such damages.

+

+   9. Accepting Warranty or Additional Liability. While redistributing

+      the Work or Derivative Works thereof, You may choose to offer,

+      and charge a fee for, acceptance of support, warranty, indemnity,

+      or other liability obligations and/or rights consistent with this

+      License. However, in accepting such obligations, You may act only

+      on Your own behalf and on Your sole responsibility, not on behalf

+      of any other Contributor, and only if You agree to indemnify,

+      defend, and hold each Contributor harmless for any liability

+      incurred by, or claims asserted against, such Contributor by reason

+      of your accepting any such warranty or additional liability.

+

+   END OF TERMS AND CONDITIONS

+

+   APPENDIX: How to apply the Apache License to your work.

+

+      To apply the Apache License to your work, attach the following

+      boilerplate notice, with the fields enclosed by brackets "{}"

+      replaced with your own identifying information. (Don't include

+      the brackets!)  The text should be enclosed in the appropriate

+      comment syntax for the file format. We also recommend that a

+      file or class name and description of purpose be included on the

+      same "printed page" as the copyright notice for easier

+      identification within third-party archives.

+

+   Copyright 2015, Google Inc

+   Copyright 2018, GoGo Authors

+

+   Licensed under the Apache License, Version 2.0 (the "License");

+   you may not use this file except in compliance with the License.

+   You may obtain a copy of the License at

+

+       http://www.apache.org/licenses/LICENSE-2.0

+

+   Unless required by applicable law or agreed to in writing, software

+   distributed under the License is distributed on an "AS IS" BASIS,

+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+   See the License for the specific language governing permissions and

+   limitations under the License.

+

@@ -3,17 +3,24 @@

 package rpc

-import proto "github.com/gogo/protobuf/proto"

-import fmt "fmt"

-import math "math"

-

-import strconv "strconv"

+import (

+	fmt "fmt"

+	proto "github.com/gogo/protobuf/proto"

+	math "math"

+	strconv "strconv"

+)

 // Reference imports to suppress errors if they are not otherwise used.

 var _ = proto.Marshal

 var _ = fmt.Errorf

 var _ = math.Inf

+// This is a compile-time assertion to ensure that this generated file

+// is compatible with the proto package it is being compiled against.

+// A compilation error at this line likely means your copy of the

+// proto package needs to be updated.

+const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package

+

 // The canonical error codes for Google APIs.

 //

 //

@@ -181,6 +188,7 @@ var Code_name = map[int32]string{

 	14: "UNAVAILABLE",

 	15: "DATA_LOSS",

 }

+

 var Code_value = map[string]int32{

 	"OK":                  0,

 	"CANCELLED":           1,

@@ -201,22 +209,17 @@ var Code_value = map[string]int32{

 	"DATA_LOSS":           15,

 }

-func (Code) EnumDescriptor() ([]byte, []int) { return fileDescriptorCode, []int{0} }

+func (Code) EnumDescriptor() ([]byte, []int) {

+	return fileDescriptor_fe593a732623ccf0, []int{0}

+}

 func init() {

 	proto.RegisterEnum("google.rpc.Code", Code_name, Code_value)

 }

-func (x Code) String() string {

-	s, ok := Code_name[int32(x)]

-	if ok {

-		return s

-	}

-	return strconv.Itoa(int(x))

-}

-func init() { proto.RegisterFile("google/rpc/code.proto", fileDescriptorCode) }

+func init() { proto.RegisterFile("google/rpc/code.proto", fileDescriptor_fe593a732623ccf0) }

-var fileDescriptorCode = []byte{

+var fileDescriptor_fe593a732623ccf0 = []byte{

 	// 393 bytes of a gzipped FileDescriptorProto

 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0x91, 0x3d, 0x6e, 0x13, 0x41,

 	0x14, 0xc7, 0x3d, 0x76, 0x70, 0xe2, 0xf1, 0xd7, 0xcb, 0x84, 0x40, 0x37, 0x07, 0xa0, 0x70, 0x0a,

@@ -244,3 +247,11 @@ var fileDescriptorCode = []byte{

 	0xf3, 0xb5, 0x3f, 0x08, 0x65, 0xf1, 0x61, 0xf8, 0xb7, 0xaa, 0xd7, 0x7f, 0x02, 0x00, 0x00, 0xff,

 	0xff, 0x03, 0xd4, 0x27, 0xff, 0xc3, 0x01, 0x00, 0x00,

 }

+

+func (x Code) String() string {

+	s, ok := Code_name[int32(x)]

+	if ok {

+		return s

+	}

+	return strconv.Itoa(int(x))

+}

@@ -22,7 +22,6 @@ option java_outer_classname = "CodeProto";

 option java_package = "com.google.rpc";

 option objc_class_prefix = "RPC";

-

 // The canonical error codes for Google APIs.

 //

 //

@@ -3,21 +3,28 @@

 package rpc

-import proto "github.com/gogo/protobuf/proto"

-import fmt "fmt"

-import math "math"

-import google_protobuf1 "github.com/gogo/protobuf/types"

-

-import strings "strings"

-import reflect "reflect"

-

-import io "io"

+import (

+	bytes "bytes"

+	fmt "fmt"

+	proto "github.com/gogo/protobuf/proto"

+	types "github.com/gogo/protobuf/types"

+	io "io"

+	math "math"

+	reflect "reflect"

+	strings "strings"

+)

 // Reference imports to suppress errors if they are not otherwise used.

 var _ = proto.Marshal

 var _ = fmt.Errorf

 var _ = math.Inf

+// This is a compile-time assertion to ensure that this generated file

+// is compatible with the proto package it is being compiled against.

+// A compilation error at this line likely means your copy of the

+// proto package needs to be updated.

+const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package

+

 // Describes when the clients can retry a failed request. Clients could ignore

 // the recommendation here or retry when this information is missing from error

 // responses.

@@ -33,14 +40,45 @@ var _ = math.Inf

 // reached.

 type RetryInfo struct {

 	// Clients should wait at least this long between retrying the same request.

-	RetryDelay *google_protobuf1.Duration `protobuf:"bytes,1,opt,name=retry_delay,json=retryDelay" json:"retry_delay,omitempty"`

+	RetryDelay           *types.Duration `protobuf:"bytes,1,opt,name=retry_delay,json=retryDelay,proto3" json:"retry_delay,omitempty"`

+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`

+	XXX_unrecognized     []byte          `json:"-"`

+	XXX_sizecache        int32           `json:"-"`

+}

+

+func (m *RetryInfo) Reset()      { *m = RetryInfo{} }

+func (*RetryInfo) ProtoMessage() {}

+func (*RetryInfo) Descriptor() ([]byte, []int) {

+	return fileDescriptor_851816e4d6b6361a, []int{0}

+}

+func (m *RetryInfo) XXX_Unmarshal(b []byte) error {

+	return m.Unmarshal(b)

+}

+func (m *RetryInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {

+	if deterministic {

+		return xxx_messageInfo_RetryInfo.Marshal(b, m, deterministic)

+	} else {

+		b = b[:cap(b)]

+		n, err := m.MarshalTo(b)

+		if err != nil {

+			return nil, err

+		}

+		return b[:n], nil

+	}

+}

+func (m *RetryInfo) XXX_Merge(src proto.Message) {

+	xxx_messageInfo_RetryInfo.Merge(m, src)

+}

+func (m *RetryInfo) XXX_Size() int {

+	return m.Size()

+}

+func (m *RetryInfo) XXX_DiscardUnknown() {

+	xxx_messageInfo_RetryInfo.DiscardUnknown(m)

 }

-func (m *RetryInfo) Reset()                    { *m = RetryInfo{} }

-func (*RetryInfo) ProtoMessage()               {}

-func (*RetryInfo) Descriptor() ([]byte, []int) { return fileDescriptorErrorDetails, []int{0} }

+var xxx_messageInfo_RetryInfo proto.InternalMessageInfo

-func (m *RetryInfo) GetRetryDelay() *google_protobuf1.Duration {

+func (m *RetryInfo) GetRetryDelay() *types.Duration {

 	if m != nil {

 		return m.RetryDelay

 	}

@@ -54,14 +92,45 @@ func (*RetryInfo) XXX_MessageName() string {

 // Describes additional debugging info.

 type DebugInfo struct {

 	// The stack trace entries indicating where the error occurred.

-	StackEntries []string `protobuf:"bytes,1,rep,name=stack_entries,json=stackEntries" json:"stack_entries,omitempty"`

+	StackEntries []string `protobuf:"bytes,1,rep,name=stack_entries,json=stackEntries,proto3" json:"stack_entries,omitempty"`

 	// Additional debugging information provided by the server.

-	Detail string `protobuf:"bytes,2,opt,name=detail,proto3" json:"detail,omitempty"`

+	Detail               string   `protobuf:"bytes,2,opt,name=detail,proto3" json:"detail,omitempty"`

+	XXX_NoUnkeyedLiteral struct{} `json:"-"`

+	XXX_unrecognized     []byte   `json:"-"`

+	XXX_sizecache        int32    `json:"-"`

+}

+

+func (m *DebugInfo) Reset()      { *m = DebugInfo{} }

+func (*DebugInfo) ProtoMessage() {}

+func (*DebugInfo) Descriptor() ([]byte, []int) {

+	return fileDescriptor_851816e4d6b6361a, []int{1}

+}

+func (m *DebugInfo) XXX_Unmarshal(b []byte) error {

+	return m.Unmarshal(b)

+}

+func (m *DebugInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {

+	if deterministic {

+		return xxx_messageInfo_DebugInfo.Marshal(b, m, deterministic)

+	} else {

+		b = b[:cap(b)]

+		n, err := m.MarshalTo(b)

+		if err != nil {

+			return nil, err

+		}

+		return b[:n], nil

+	}

+}

+func (m *DebugInfo) XXX_Merge(src proto.Message) {

+	xxx_messageInfo_DebugInfo.Merge(m, src)

+}

+func (m *DebugInfo) XXX_Size() int {

+	return m.Size()

+}

+func (m *DebugInfo) XXX_DiscardUnknown() {

+	xxx_messageInfo_DebugInfo.DiscardUnknown(m)

 }

-func (m *DebugInfo) Reset()                    { *m = DebugInfo{} }

-func (*DebugInfo) ProtoMessage()               {}

-func (*DebugInfo) Descriptor() ([]byte, []int) { return fileDescriptorErrorDetails, []int{1} }

+var xxx_messageInfo_DebugInfo proto.InternalMessageInfo

 func (m *DebugInfo) GetStackEntries() []string {

 	if m != nil {

@@ -94,12 +163,43 @@ func (*DebugInfo) XXX_MessageName() string {

 // quota failure.

 type QuotaFailure struct {

 	// Describes all quota violations.

-	Violations []*QuotaFailure_Violation `protobuf:"bytes,1,rep,name=violations" json:"violations,omitempty"`

+	Violations           []*QuotaFailure_Violation `protobuf:"bytes,1,rep,name=violations,proto3" json:"violations,omitempty"`

+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`

+	XXX_unrecognized     []byte                    `json:"-"`

+	XXX_sizecache        int32                     `json:"-"`

+}

+

+func (m *QuotaFailure) Reset()      { *m = QuotaFailure{} }

+func (*QuotaFailure) ProtoMessage() {}

+func (*QuotaFailure) Descriptor() ([]byte, []int) {

+	return fileDescriptor_851816e4d6b6361a, []int{2}

+}

+func (m *QuotaFailure) XXX_Unmarshal(b []byte) error {

+	return m.Unmarshal(b)

+}

+func (m *QuotaFailure) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {

+	if deterministic {

+		return xxx_messageInfo_QuotaFailure.Marshal(b, m, deterministic)

+	} else {

+		b = b[:cap(b)]

+		n, err := m.MarshalTo(b)

+		if err != nil {

+			return nil, err

+		}

+		return b[:n], nil

+	}

+}

+func (m *QuotaFailure) XXX_Merge(src proto.Message) {

+	xxx_messageInfo_QuotaFailure.Merge(m, src)

+}

+func (m *QuotaFailure) XXX_Size() int {

+	return m.Size()

+}

+func (m *QuotaFailure) XXX_DiscardUnknown() {

+	xxx_messageInfo_QuotaFailure.DiscardUnknown(m)

 }

-func (m *QuotaFailure) Reset()                    { *m = QuotaFailure{} }

-func (*QuotaFailure) ProtoMessage()               {}

-func (*QuotaFailure) Descriptor() ([]byte, []int) { return fileDescriptorErrorDetails, []int{2} }

+var xxx_messageInfo_QuotaFailure proto.InternalMessageInfo

 func (m *QuotaFailure) GetViolations() []*QuotaFailure_Violation {

 	if m != nil {

@@ -126,15 +226,44 @@ type QuotaFailure_Violation struct {

 	//

 	// For example: "Service disabled" or "Daily Limit for read operations

 	// exceeded".

-	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`

+	Description          string   `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`

+	XXX_NoUnkeyedLiteral struct{} `json:"-"`

+	XXX_unrecognized     []byte   `json:"-"`

+	XXX_sizecache        int32    `json:"-"`

 }

 func (m *QuotaFailure_Violation) Reset()      { *m = QuotaFailure_Violation{} }

 func (*QuotaFailure_Violation) ProtoMessage() {}

 func (*QuotaFailure_Violation) Descriptor() ([]byte, []int) {

-	return fileDescriptorErrorDetails, []int{2, 0}

+	return fileDescriptor_851816e4d6b6361a, []int{2, 0}

+}

+func (m *QuotaFailure_Violation) XXX_Unmarshal(b []byte) error {

+	return m.Unmarshal(b)

+}

+func (m *QuotaFailure_Violation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {

+	if deterministic {

+		return xxx_messageInfo_QuotaFailure_Violation.Marshal(b, m, deterministic)

+	} else {

+		b = b[:cap(b)]

+		n, err := m.MarshalTo(b)

+		if err != nil {

+			return nil, err

+		}

+		return b[:n], nil

+	}

+}

+func (m *QuotaFailure_Violation) XXX_Merge(src proto.Message) {

+	xxx_messageInfo_QuotaFailure_Violation.Merge(m, src)

+}

+func (m *QuotaFailure_Violation) XXX_Size() int {

+	return m.Size()

+}

+func (m *QuotaFailure_Violation) XXX_DiscardUnknown() {

+	xxx_messageInfo_QuotaFailure_Violation.DiscardUnknown(m)

 }

+var xxx_messageInfo_QuotaFailure_Violation proto.InternalMessageInfo

+

 func (m *QuotaFailure_Violation) GetSubject() string {

 	if m != nil {

 		return m.Subject

@@ -160,12 +289,43 @@ func (*QuotaFailure_Violation) XXX_MessageName() string {

 // PreconditionFailure message.

 type PreconditionFailure struct {

 	// Describes all precondition violations.

-	Violations []*PreconditionFailure_Violation `protobuf:"bytes,1,rep,name=violations" json:"violations,omitempty"`

+	Violations           []*PreconditionFailure_Violation `protobuf:"bytes,1,rep,name=violations,proto3" json:"violations,omitempty"`

+	XXX_NoUnkeyedLiteral struct{}                         `json:"-"`

+	XXX_unrecognized     []byte                           `json:"-"`

+	XXX_sizecache        int32                            `json:"-"`

+}

+

+func (m *PreconditionFailure) Reset()      { *m = PreconditionFailure{} }

+func (*PreconditionFailure) ProtoMessage() {}

+func (*PreconditionFailure) Descriptor() ([]byte, []int) {

+	return fileDescriptor_851816e4d6b6361a, []int{3}

+}

+func (m *PreconditionFailure) XXX_Unmarshal(b []byte) error {

+	return m.Unmarshal(b)

+}

+func (m *PreconditionFailure) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {

+	if deterministic {

+		return xxx_messageInfo_PreconditionFailure.Marshal(b, m, deterministic)

+	} else {

+		b = b[:cap(b)]

+		n, err := m.MarshalTo(b)

+		if err != nil {

+			return nil, err

+		}

+		return b[:n], nil

+	}

+}

+func (m *PreconditionFailure) XXX_Merge(src proto.Message) {

+	xxx_messageInfo_PreconditionFailure.Merge(m, src)

+}

+func (m *PreconditionFailure) XXX_Size() int {

+	return m.Size()

+}

+func (m *PreconditionFailure) XXX_DiscardUnknown() {

+	xxx_messageInfo_PreconditionFailure.DiscardUnknown(m)

 }

-func (m *PreconditionFailure) Reset()                    { *m = PreconditionFailure{} }

-func (*PreconditionFailure) ProtoMessage()               {}

-func (*PreconditionFailure) Descriptor() ([]byte, []int) { return fileDescriptorErrorDetails, []int{3} }

+var xxx_messageInfo_PreconditionFailure proto.InternalMessageInfo

 func (m *PreconditionFailure) GetViolations() []*PreconditionFailure_Violation {

 	if m != nil {

@@ -192,15 +352,44 @@ type PreconditionFailure_Violation struct {

 	// description to understand how to fix the failure.

 	//

 	// For example: "Terms of service not accepted".

-	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`

+	Description          string   `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`

+	XXX_NoUnkeyedLiteral struct{} `json:"-"`

+	XXX_unrecognized     []byte   `json:"-"`

+	XXX_sizecache        int32    `json:"-"`

 }

 func (m *PreconditionFailure_Violation) Reset()      { *m = PreconditionFailure_Violation{} }

 func (*PreconditionFailure_Violation) ProtoMessage() {}

 func (*PreconditionFailure_Violation) Descriptor() ([]byte, []int) {

-	return fileDescriptorErrorDetails, []int{3, 0}

+	return fileDescriptor_851816e4d6b6361a, []int{3, 0}

+}

+func (m *PreconditionFailure_Violation) XXX_Unmarshal(b []byte) error {

+	return m.Unmarshal(b)

+}

+func (m *PreconditionFailure_Violation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {

+	if deterministic {

+		return xxx_messageInfo_PreconditionFailure_Violation.Marshal(b, m, deterministic)

+	} else {

+		b = b[:cap(b)]

+		n, err := m.MarshalTo(b)

+		if err != nil {

+			return nil, err

+		}

+		return b[:n], nil

+	}

+}

+func (m *PreconditionFailure_Violation) XXX_Merge(src proto.Message) {

+	xxx_messageInfo_PreconditionFailure_Violation.Merge(m, src)

+}

+func (m *PreconditionFailure_Violation) XXX_Size() int {

+	return m.Size()

+}

+func (m *PreconditionFailure_Violation) XXX_DiscardUnknown() {

+	xxx_messageInfo_PreconditionFailure_Violation.DiscardUnknown(m)

 }

+var xxx_messageInfo_PreconditionFailure_Violation proto.InternalMessageInfo

+

 func (m *PreconditionFailure_Violation) GetType() string {

 	if m != nil {

 		return m.Type

@@ -230,12 +419,43 @@ func (*PreconditionFailure_Violation) XXX_MessageName() string {

 // syntactic aspects of the request.

 type BadRequest struct {

 	// Describes all violations in a client request.

-	FieldViolations []*BadRequest_FieldViolation `protobuf:"bytes,1,rep,name=field_violations,json=fieldViolations" json:"field_violations,omitempty"`

+	FieldViolations      []*BadRequest_FieldViolation `protobuf:"bytes,1,rep,name=field_violations,json=fieldViolations,proto3" json:"field_violations,omitempty"`

+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`

+	XXX_unrecognized     []byte                       `json:"-"`

+	XXX_sizecache        int32                        `json:"-"`

+}

+

+func (m *BadRequest) Reset()      { *m = BadRequest{} }

+func (*BadRequest) ProtoMessage() {}

+func (*BadRequest) Descriptor() ([]byte, []int) {

+	return fileDescriptor_851816e4d6b6361a, []int{4}

+}

+func (m *BadRequest) XXX_Unmarshal(b []byte) error {

+	return m.Unmarshal(b)

+}

+func (m *BadRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {

+	if deterministic {

+		return xxx_messageInfo_BadRequest.Marshal(b, m, deterministic)

+	} else {

+		b = b[:cap(b)]

+		n, err := m.MarshalTo(b)

+		if err != nil {

+			return nil, err

+		}

+		return b[:n], nil

+	}

+}

+func (m *BadRequest) XXX_Merge(src proto.Message) {

+	xxx_messageInfo_BadRequest.Merge(m, src)

+}

+func (m *BadRequest) XXX_Size() int {

+	return m.Size()

+}

+func (m *BadRequest) XXX_DiscardUnknown() {

+	xxx_messageInfo_BadRequest.DiscardUnknown(m)

 }

-func (m *BadRequest) Reset()                    { *m = BadRequest{} }

-func (*BadRequest) ProtoMessage()               {}

-func (*BadRequest) Descriptor() ([]byte, []int) { return fileDescriptorErrorDetails, []int{4} }

+var xxx_messageInfo_BadRequest proto.InternalMessageInfo

 func (m *BadRequest) GetFieldViolations() []*BadRequest_FieldViolation {

 	if m != nil {

@@ -255,14 +475,43 @@ type BadRequest_FieldViolation struct {

 	// field. E.g., "field_violations.field" would identify this field.

 	Field string `protobuf:"bytes,1,opt,name=field,proto3" json:"field,omitempty"`

 	// A description of why the request element is bad.

-	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`

+	Description          string   `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`

+	XXX_NoUnkeyedLiteral struct{} `json:"-"`

+	XXX_unrecognized     []byte   `json:"-"`

+	XXX_sizecache        int32    `json:"-"`

 }

 func (m *BadRequest_FieldViolation) Reset()      { *m = BadRequest_FieldViolation{} }

 func (*BadRequest_FieldViolation) ProtoMessage() {}

 func (*BadRequest_FieldViolation) Descriptor() ([]byte, []int) {

-	return fileDescriptorErrorDetails, []int{4, 0}

+	return fileDescriptor_851816e4d6b6361a, []int{4, 0}

+}

+func (m *BadRequest_FieldViolation) XXX_Unmarshal(b []byte) error {

+	return m.Unmarshal(b)

+}

+func (m *BadRequest_FieldViolation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {

+	if deterministic {

+		return xxx_messageInfo_BadRequest_FieldViolation.Marshal(b, m, deterministic)

+	} else {

+		b = b[:cap(b)]

+		n, err := m.MarshalTo(b)

+		if err != nil {

+			return nil, err

+		}

+		return b[:n], nil

+	}

+}

+func (m *BadRequest_FieldViolation) XXX_Merge(src proto.Message) {

+	xxx_messageInfo_BadRequest_FieldViolation.Merge(m, src)

+}

+func (m *BadRequest_FieldViolation) XXX_Size() int {

+	return m.Size()

 }

+func (m *BadRequest_FieldViolation) XXX_DiscardUnknown() {

+	xxx_messageInfo_BadRequest_FieldViolation.DiscardUnknown(m)

+}

+

+var xxx_messageInfo_BadRequest_FieldViolation proto.InternalMessageInfo

 func (m *BadRequest_FieldViolation) GetField() string {

 	if m != nil {

@@ -290,12 +539,43 @@ type RequestInfo struct {

 	RequestId string `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`

 	// Any data that was used to serve this request. For example, an encrypted

 	// stack trace that can be sent back to the service provider for debugging.

-	ServingData string `protobuf:"bytes,2,opt,name=serving_data,json=servingData,proto3" json:"serving_data,omitempty"`

+	ServingData          string   `protobuf:"bytes,2,opt,name=serving_data,json=servingData,proto3" json:"serving_data,omitempty"`

+	XXX_NoUnkeyedLiteral struct{} `json:"-"`

+	XXX_unrecognized     []byte   `json:"-"`

+	XXX_sizecache        int32    `json:"-"`

+}

+

+func (m *RequestInfo) Reset()      { *m = RequestInfo{} }

+func (*RequestInfo) ProtoMessage() {}

+func (*RequestInfo) Descriptor() ([]byte, []int) {

+	return fileDescriptor_851816e4d6b6361a, []int{5}

+}

+func (m *RequestInfo) XXX_Unmarshal(b []byte) error {

+	return m.Unmarshal(b)

+}

+func (m *RequestInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {

+	if deterministic {

+		return xxx_messageInfo_RequestInfo.Marshal(b, m, deterministic)

+	} else {

+		b = b[:cap(b)]

+		n, err := m.MarshalTo(b)

+		if err != nil {

+			return nil, err

+		}

+		return b[:n], nil

+	}

+}

+func (m *RequestInfo) XXX_Merge(src proto.Message) {

+	xxx_messageInfo_RequestInfo.Merge(m, src)

+}

+func (m *RequestInfo) XXX_Size() int {

+	return m.Size()

+}

+func (m *RequestInfo) XXX_DiscardUnknown() {

+	xxx_messageInfo_RequestInfo.DiscardUnknown(m)

 }

-func (m *RequestInfo) Reset()                    { *m = RequestInfo{} }

-func (*RequestInfo) ProtoMessage()               {}

-func (*RequestInfo) Descriptor() ([]byte, []int) { return fileDescriptorErrorDetails, []int{5} }

+var xxx_messageInfo_RequestInfo proto.InternalMessageInfo

 func (m *RequestInfo) GetRequestId() string {

 	if m != nil {

@@ -323,7 +603,8 @@ type ResourceInfo struct {

 	ResourceType string `protobuf:"bytes,1,opt,name=resource_type,json=resourceType,proto3" json:"resource_type,omitempty"`

 	// The name of the resource being accessed.  For example, a shared calendar

 	// name: "example.com_4fghdhgsrgh@group.calendar.google.com", if the current

-	// error is [google.rpc.Code.PERMISSION_DENIED][google.rpc.Code.PERMISSION_DENIED].

+	// error is

+	// [google.rpc.Code.PERMISSION_DENIED][google.rpc.Code.PERMISSION_DENIED].

 	ResourceName string `protobuf:"bytes,2,opt,name=resource_name,json=resourceName,proto3" json:"resource_name,omitempty"`

 	// The owner of the resource (optional).

 	// For example, "user:<owner email>" or "project:<Google developer project

@@ -332,12 +613,43 @@ type ResourceInfo struct {

 	// Describes what error is encountered when accessing this resource.

 	// For example, updating a cloud project may require the `writer` permission

 	// on the developer console project.

-	Description string `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"`

+	Description          string   `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"`

+	XXX_NoUnkeyedLiteral struct{} `json:"-"`

+	XXX_unrecognized     []byte   `json:"-"`

+	XXX_sizecache        int32    `json:"-"`

+}

+

+func (m *ResourceInfo) Reset()      { *m = ResourceInfo{} }

+func (*ResourceInfo) ProtoMessage() {}

+func (*ResourceInfo) Descriptor() ([]byte, []int) {

+	return fileDescriptor_851816e4d6b6361a, []int{6}

+}

+func (m *ResourceInfo) XXX_Unmarshal(b []byte) error {

+	return m.Unmarshal(b)

+}

+func (m *ResourceInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {

+	if deterministic {

+		return xxx_messageInfo_ResourceInfo.Marshal(b, m, deterministic)

+	} else {

+		b = b[:cap(b)]

+		n, err := m.MarshalTo(b)

+		if err != nil {

+			return nil, err

+		}

+		return b[:n], nil

+	}

+}

+func (m *ResourceInfo) XXX_Merge(src proto.Message) {

+	xxx_messageInfo_ResourceInfo.Merge(m, src)

+}

+func (m *ResourceInfo) XXX_Size() int {

+	return m.Size()

+}

+func (m *ResourceInfo) XXX_DiscardUnknown() {

+	xxx_messageInfo_ResourceInfo.DiscardUnknown(m)

 }

-func (m *ResourceInfo) Reset()                    { *m = ResourceInfo{} }

-func (*ResourceInfo) ProtoMessage()               {}

-func (*ResourceInfo) Descriptor() ([]byte, []int) { return fileDescriptorErrorDetails, []int{6} }

+var xxx_messageInfo_ResourceInfo proto.InternalMessageInfo

 func (m *ResourceInfo) GetResourceType() string {

 	if m != nil {

@@ -378,12 +690,43 @@ func (*ResourceInfo) XXX_MessageName() string {

 // directly to the right place in the developer console to flip the bit.

 type Help struct {

 	// URL(s) pointing to additional information on handling the current error.

-	Links []*Help_Link `protobuf:"bytes,1,rep,name=links" json:"links,omitempty"`

+	Links                []*Help_Link `protobuf:"bytes,1,rep,name=links,proto3" json:"links,omitempty"`

+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`

+	XXX_unrecognized     []byte       `json:"-"`

+	XXX_sizecache        int32        `json:"-"`

+}

+

+func (m *Help) Reset()      { *m = Help{} }

+func (*Help) ProtoMessage() {}

+func (*Help) Descriptor() ([]byte, []int) {

+	return fileDescriptor_851816e4d6b6361a, []int{7}

+}

+func (m *Help) XXX_Unmarshal(b []byte) error {

+	return m.Unmarshal(b)

+}

+func (m *Help) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {

+	if deterministic {

+		return xxx_messageInfo_Help.Marshal(b, m, deterministic)

+	} else {

+		b = b[:cap(b)]

+		n, err := m.MarshalTo(b)

+		if err != nil {

+			return nil, err

+		}

+		return b[:n], nil

+	}

+}

+func (m *Help) XXX_Merge(src proto.Message) {

+	xxx_messageInfo_Help.Merge(m, src)

+}

+func (m *Help) XXX_Size() int {

+	return m.Size()

+}

+func (m *Help) XXX_DiscardUnknown() {

+	xxx_messageInfo_Help.DiscardUnknown(m)

 }

-func (m *Help) Reset()                    { *m = Help{} }

-func (*Help) ProtoMessage()               {}

-func (*Help) Descriptor() ([]byte, []int) { return fileDescriptorErrorDetails, []int{7} }

+var xxx_messageInfo_Help proto.InternalMessageInfo

 func (m *Help) GetLinks() []*Help_Link {

 	if m != nil {

@@ -401,12 +744,43 @@ type Help_Link struct {

 	// Describes what the link offers.

 	Description string `protobuf:"bytes,1,opt,name=description,proto3" json:"description,omitempty"`

 	// The URL of the link.