Skip to content

K
k3s
Commit f856655b authored by Pengfei Ni's avatar Pengfei Ni
Browse files
Options

Fix issues because of rebase

parent 0bbf72c4
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
pkg/cloudprovider/providers/azure/azure_controller_common_test.go
View file @ f856655b
...@@ -20,7 +20,7 @@ import ( ...@@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute"
) )
func TestAttachDisk(t *testing.T) { func TestAttachDisk(t *testing.T) {
......
pkg/cloudprovider/providers/azure/azure_vmsets.go
View file @ f856655b
...@@ -17,6 +17,8 @@ limitations under the License. ...@@ -17,6 +17,8 @@ limitations under the License.
package azure package azure
import ( import (
"net/http"
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment