Automatic merge from release/2.1.0 -> release/2.2.0

* commit '8d55a35d1d76a91ac0db04c2079f14463f1e0833':
  zones/<zone_id>/capabilities => zones/<zone_id>/capability climc changes
This commit is contained in:
邱剑
2018-09-13 16:49:47 +08:00
+2 -2
View File
@@ -101,8 +101,8 @@ func init() {
return nil
})
R(&ZoneShowOptions{}, "zone-capabilities", "Show zone's capacibilities", func(s *mcclient.ClientSession, args *ZoneShowOptions) error {
result, err := modules.Zones.GetSpecific(s, args.ID, "capabilities", nil)
R(&ZoneShowOptions{}, "zone-capability", "Show zone's capacibilities", func(s *mcclient.ClientSession, args *ZoneShowOptions) error {
result, err := modules.Zones.GetSpecific(s, args.ID, "capability", nil)
if err != nil {
return err
}