Upgrade to 0.12

1 files changed, 27 insertions, 18 deletions

diff --git a/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go b/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go
index e3c56d3..78ee523 100644
--- a/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go
+++ b/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/any.proto
 
-package any // import "github.com/golang/protobuf/ptypes/any"
+package any
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+        fmt "fmt"
+        proto "github.com/golang/protobuf/proto"
+        math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +18,7 @@ var _ = math.Inf
 // 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.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // `Any` contains an arbitrary serialized protocol buffer message along with a
 // URL that describes the type of the serialized message.
@@ -99,17 +101,18 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 //     }
 //
 type Any struct {
-        // A URL/resource name whose content describes the type of the
-        // serialized protocol buffer message.
+        // A URL/resource name that uniquely identifies the type of the serialized
+        // protocol buffer message. The last segment of the URL's path must represent
+        // the fully qualified name of the type (as in
+        // `path/google.protobuf.Duration`). The name should be in a canonical form
+        // (e.g., leading "." is not accepted).
         //
-        // For URLs which use the scheme `http`, `https`, or no scheme, the
-        // following restrictions and interpretations apply:
+        // In practice, teams usually precompile into the binary all types that they
+        // expect it to use in the context of Any. However, for URLs which use the
+        // scheme `http`, `https`, or no scheme, one can optionally set up a type
+        // server that maps type URLs to message definitions as follows:
         //
         // * If no scheme is provided, `https` is assumed.
-        // * The last segment of the URL's path must represent the fully
-        //   qualified name of the type (as in `path/google.protobuf.Duration`).
-        //   The name should be in a canonical form (e.g., leading "." is
-        //   not accepted).
         // * An HTTP GET on the URL must yield a [google.protobuf.Type][]
         //   value in binary format, or produce an error.
         // * Applications are allowed to cache lookup results based on the
@@ -118,6 +121,10 @@ type Any struct {
         //   on changes to types. (Use versioned type names to manage
         //   breaking changes.)
         //
+        // Note: this functionality is not currently available in the official
+        // protobuf release, and it is not used for type URLs beginning with
+        // type.googleapis.com.
+        //
         // Schemes other than `http`, `https` (or the empty scheme) might be
         // used with implementation specific semantics.
         //
@@ -133,17 +140,19 @@ func (m *Any) Reset()         { *m = Any{} }
 func (m *Any) String() string { return proto.CompactTextString(m) }
 func (*Any) ProtoMessage()    {}
 func (*Any) Descriptor() ([]byte, []int) {
-        return fileDescriptor_any_744b9ca530f228db, []int{0}
+        return fileDescriptor_b53526c13ae22eb4, []int{0}
 }
+
 func (*Any) XXX_WellKnownType() string { return "Any" }
+
 func (m *Any) XXX_Unmarshal(b []byte) error {
         return xxx_messageInfo_Any.Unmarshal(m, b)
 }
 func (m *Any) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
         return xxx_messageInfo_Any.Marshal(b, m, deterministic)
 }
-func (dst *Any) XXX_Merge(src proto.Message) {
-        xxx_messageInfo_Any.Merge(dst, src)
+func (m *Any) XXX_Merge(src proto.Message) {
+        xxx_messageInfo_Any.Merge(m, src)
 }
 func (m *Any) XXX_Size() int {
         return xxx_messageInfo_Any.Size(m)
@@ -172,9 +181,9 @@ func init() {
         proto.RegisterType((*Any)(nil), "google.protobuf.Any")
 }
 
-func init() { proto.RegisterFile("google/protobuf/any.proto", fileDescriptor_any_744b9ca530f228db) }
+func init() { proto.RegisterFile("google/protobuf/any.proto", fileDescriptor_b53526c13ae22eb4) }
 
-var fileDescriptor_any_744b9ca530f228db = []byte{
+var fileDescriptor_b53526c13ae22eb4 = []byte{
         // 185 bytes of a gzipped FileDescriptorProto
         0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4c, 0xcf, 0xcf, 0x4f,
         0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0xcc, 0xab, 0xd4,