From 2a3bfc26fa7f9eee0daa312e8b72e916e6acaabd Mon Sep 17 00:00:00 2001 From: "James W. Brinkerhoff" Date: Mon, 7 Oct 2024 11:08:08 -0400 Subject: [PATCH] providers/supermicro/supermicro.go: Merge changes to bmcQueryor from main --- providers/supermicro/supermicro.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/providers/supermicro/supermicro.go b/providers/supermicro/supermicro.go index 4a5279dc..189f4855 100644 --- a/providers/supermicro/supermicro.go +++ b/providers/supermicro/supermicro.go @@ -315,13 +315,7 @@ func (c *Client) bmcQueryor(ctx context.Context) (bmcQueryor, error) { for _, bmc := range []bmcQueryor{x11bmc, x12bmc, x13bmc} { var err error -<<<<<<< HEAD - // Note to maintainers: x12 lacks support for the ipmi.cgi endpoint, - // which will lead to our graceful handling of ErrXMLAPIUnsupported below. - _, err = bmc.queryDeviceModel(ctx) -======= deviceModel, err := bmc.queryDeviceModel(ctx) ->>>>>>> 3d1fe09 (providers/supermicro/supermicro.go: Fix bmcQueryor to properly match queryor to model) if err != nil { if errors.Is(err, ErrXMLAPIUnsupported) { continue