diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-25 21:40:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-25 21:40:38 +0200 |
| commit | 5b7086abda91f4301af3bfb642d416a22349c276 (patch) | |
| tree | bf139f29b261e55c161394637f1c7073da5103f0 /vendor/k8s.io/apimachinery/pkg/runtime/extension.go | |
| parent | a488e197a6e3947dd420b40ed834b50db9c829c3 (diff) | |
| parent | 2388222e98462fdbbe44f3e091b2b79d80956a9a (diff) | |
| download | podman-5b7086abda91f4301af3bfb642d416a22349c276.tar.gz podman-5b7086abda91f4301af3bfb642d416a22349c276.tar.bz2 podman-5b7086abda91f4301af3bfb642d416a22349c276.zip | |
Merge pull request #3418 from vrothberg/go-modules
update dependencies
Diffstat (limited to 'vendor/k8s.io/apimachinery/pkg/runtime/extension.go')
| -rw-r--r-- | vendor/k8s.io/apimachinery/pkg/runtime/extension.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/extension.go b/vendor/k8s.io/apimachinery/pkg/runtime/extension.go index 737e2e9ff..9056397fa 100644 --- a/vendor/k8s.io/apimachinery/pkg/runtime/extension.go +++ b/vendor/k8s.io/apimachinery/pkg/runtime/extension.go @@ -32,7 +32,7 @@ func (re *RawExtension) UnmarshalJSON(in []byte) error { return nil } -// Marshal may get called on pointers or values, so implement MarshalJSON on value. +// MarshalJSON may get called on pointers or values, so implement MarshalJSON on value. // http://stackoverflow.com/questions/21390979/custom-marshaljson-never-gets-called-in-go func (re RawExtension) MarshalJSON() ([]byte, error) { if re.Raw == nil { |