Skip to content

Commit

Permalink
Merge pull request nutanix#55 from nutanix/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
JonKohler authored May 15, 2018
2 parents 7a8e6f4 + b4be56c commit 72fd490
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 2 deletions.
10 changes: 10 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
language: go
go:
- 1.10

go_import_path: github.com/terraform-providers/terraform-provider-nutanix

install:
- bash scripts/gogetcookie.sh
- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh

script:
- make vendor-status
- make testacc
2 changes: 1 addition & 1 deletion GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ errcheck:
@sh -c "'$(CURDIR)/scripts/errcheck.sh'"

vendor-status:
@govendor status
@dep ensure

test-compile:
@if [ "$(TEST)" = "./..." ]; then \
Expand Down
4 changes: 4 additions & 0 deletions client/v3/v3_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,10 @@ func (op Operations) CreateOrUpdateCategoryValue(name string, body *CategoryValu

err = op.client.Do(ctx, req, categoryValueResponse)

if err != nil {
return nil, err
}

return categoryValueResponse, nil
}

Expand Down
2 changes: 1 addition & 1 deletion nutanix/resource_nutanix_subnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ func resourceNutanixSubnetDelete(d *schema.ResourceData, meta interface{}) error
}

func resourceNutanixSubnetExists(conn *v3.Client, name string) (*string, error) {
log.Printf("[DEBUG] Get Subnet Existance : %s", name)
log.Printf("[DEBUG] Get Subnet Existence: %s", name)

subnetEntities := &v3.SubnetListMetadata{}
var subnetUUID *string
Expand Down

0 comments on commit 72fd490

Please sign in to comment.