Automatic merge from release/2.0.0 -> release/2.1.0

* commit 'ecfd32480b5d90b78ea3c59ef435e554596db21a':
  zone capability的hypervisor去重
This commit is contained in:
李泽玺
2018-08-16 16:23:53 +08:00
+1 -1
View File
@@ -515,7 +515,7 @@ func (self *SZone) GetDetailsCapabilities(ctx context.Context, userCred mcclient
}
func (self *SZone) getHypervisors() []string {
q := HostManager.Query("host_type").Equals("zone_id", self.Id)
q := HostManager.Query("host_type").Equals("zone_id", self.Id).Distinct()
rows, err := q.Rows()
if err != nil {
return nil