Revert "Merge branch 'dev/k8s-deviceid-model' into master"

This reverts commit 194c27fadf, reversing
changes made to 96d4d79d1f.
This commit is contained in:
Tomofumi Hayashi
2018-08-30 20:15:30 +09:00
parent 194c27fadf
commit 517f2d4b7a
604 changed files with 6879 additions and 21568 deletions

View File

@@ -90,8 +90,12 @@ func (in *VolumeAttachmentSource) DeepCopyInto(out *VolumeAttachmentSource) {
*out = *in
if in.PersistentVolumeName != nil {
in, out := &in.PersistentVolumeName, &out.PersistentVolumeName
*out = new(string)
**out = **in
if *in == nil {
*out = nil
} else {
*out = new(string)
**out = **in
}
}
return
}
@@ -135,13 +139,21 @@ func (in *VolumeAttachmentStatus) DeepCopyInto(out *VolumeAttachmentStatus) {
}
if in.AttachError != nil {
in, out := &in.AttachError, &out.AttachError
*out = new(VolumeError)
(*in).DeepCopyInto(*out)
if *in == nil {
*out = nil
} else {
*out = new(VolumeError)
(*in).DeepCopyInto(*out)
}
}
if in.DetachError != nil {
in, out := &in.DetachError, &out.DetachError
*out = new(VolumeError)
(*in).DeepCopyInto(*out)
if *in == nil {
*out = nil
} else {
*out = new(VolumeError)
(*in).DeepCopyInto(*out)
}
}
return
}