Automatic merge from release/2.2.0 -> release/2.3.0

* commit '681c46e90572f7dc6d29fd69e5f5a898ee6a5fd4':
This commit is contained in:
邱剑
2018-10-17 18:02:34 +08:00
+1 -2
View File
@@ -2,7 +2,6 @@ package azure
import (
"context"
"fmt"
"strings"
"yunion.io/x/jsonutils"
@@ -37,7 +36,7 @@ func (self *SZone) GetName() string {
}
func (self *SZone) GetGlobalId() string {
return fmt.Sprintf("%s/%s", self.region.GetGlobalId(), self.region.client.subscriptionId)
return self.region.GetGlobalId()
}
func (self *SZone) IsEmulated() bool {