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

@@ -62,8 +62,12 @@ func (in *ClusterRole) DeepCopyInto(out *ClusterRole) {
}
if in.AggregationRule != nil {
in, out := &in.AggregationRule, &out.AggregationRule
*out = new(AggregationRule)
(*in).DeepCopyInto(*out)
if *in == nil {
*out = nil
} else {
*out = new(AggregationRule)
(*in).DeepCopyInto(*out)
}
}
return
}