brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From drigod...@apache.org
Subject [2/2] brooklyn-client git commit: This closes #50
Date Mon, 08 May 2017 11:58:31 GMT
This closes #50


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/0243386c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/0243386c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/0243386c

Branch: refs/heads/master
Commit: 0243386ce7ec5bfb20796afb39ee0e53e3858c88
Parents: 6d5574a 72c98aa
Author: Duncan Godwin <drigodwin@googlemail.com>
Authored: Mon May 8 12:58:24 2017 +0100
Committer: Duncan Godwin <drigodwin@googlemail.com>
Committed: Mon May 8 12:58:24 2017 +0100

----------------------------------------------------------------------
 cli/api/catalog/catalog.go    |  9 ---------
 cli/commands/reset-catalog.go | 33 ---------------------------------
 2 files changed, 42 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/0243386c/cli/api/catalog/catalog.go
----------------------------------------------------------------------
diff --cc cli/api/catalog/catalog.go
index 7a422e2,765c752..108cf4b
--- a/cli/api/catalog/catalog.go
+++ b/cli/api/catalog/catalog.go
@@@ -278,19 -178,9 +278,10 @@@ func AddCatalog(network *net.Network, r
  		return nil, err
  	}
  	err = json.Unmarshal(body, &entities)
 -	return entities, nil
 +
 +	return entities, err
  }
  
- func Reset(network *net.Network) (string, error) {
- 	url := "/v1/catalog/reset"
- 	body, err := network.SendEmptyPostRequest(url)
- 	if err != nil {
- 		return "", err
- 	}
- 	return string(body), nil
- }
- 
  func GetLocation(network *net.Network, locationId string) (models.CatalogItemSummary, error)
{
  	url := fmt.Sprintf("/v1/catalog/locations/%s", locationId)
  	var catalogLocation models.CatalogItemSummary


Mime
View raw message