Automatic merge from release/2.5.0 -> release/2.6.0

* commit 'f552befc8f28c181ba899d403e9f2cb889abb946':
  fix account confilct
This commit is contained in:
邱剑
2019-01-22 16:05:42 +08:00
+1 -1
View File
@@ -587,7 +587,7 @@ func (self *SCloudprovider) getMoreDetails(ctx context.Context, extra *jsonutils
}
account := self.GetCloudaccount()
if account != nil {
extra.Add(jsonutils.NewString(account.GetName()), "account")
extra.Add(jsonutils.NewString(account.GetName()), "cloudaccount")
}
return extra
}