Commit 30e75be5 authored by goltermann's avatar goltermann

Update flocker-go godep to pick up new LICENSE file.

parent 699c80b7
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
}, },
{ {
"ImportPath": "github.com/ClusterHQ/flocker-go", "ImportPath": "github.com/ClusterHQ/flocker-go",
"Rev": "3f33ece70f6571f0ec45bfae2f243ab11fab6c52" "Rev": "1c0a791b33bdc01d062b376612aa04e27eed7eb3"
}, },
{ {
"ImportPath": "github.com/Sirupsen/logrus", "ImportPath": "github.com/Sirupsen/logrus",
......
...@@ -14,7 +14,7 @@ github.com/beorn7/perks/quantile | MIT? ...@@ -14,7 +14,7 @@ github.com/beorn7/perks/quantile | MIT?
github.com/blang/semver | MITname github.com/blang/semver | MITname
github.com/boltdb/bolt | MITname github.com/boltdb/bolt | MITname
github.com/camlistore/go4 | Apache-2 github.com/camlistore/go4 | Apache-2
github.com/ClusterHQ/flocker-go | UNKNOWN github.com/ClusterHQ/flocker-go | Apache-2
github.com/codegangsta/negroni | MITname github.com/codegangsta/negroni | MITname
github.com/coreos/etcd | Apache-2 github.com/coreos/etcd | Apache-2
github.com/coreos/go-etcd | Apache-2 github.com/coreos/go-etcd | Apache-2
......
...@@ -121,6 +121,7 @@ func (c Client) getURL(path string) string { ...@@ -121,6 +121,7 @@ func (c Client) getURL(path string) string {
} }
type configurationPayload struct { type configurationPayload struct {
Deleted bool `json:"deleted"`
Primary string `json:"primary"` Primary string `json:"primary"`
DatasetID string `json:"dataset_id,omitempty"` DatasetID string `json:"dataset_id,omitempty"`
MaximumSize json.Number `json:"maximum_size,omitempty"` MaximumSize json.Number `json:"maximum_size,omitempty"`
...@@ -313,7 +314,7 @@ func (c Client) GetDatasetID(metaName string) (datasetID string, err error) { ...@@ -313,7 +314,7 @@ func (c Client) GetDatasetID(metaName string) (datasetID string, err error) {
var configurations []configurationPayload var configurations []configurationPayload
if err = json.NewDecoder(resp.Body).Decode(&configurations); err == nil { if err = json.NewDecoder(resp.Body).Decode(&configurations); err == nil {
for _, c := range configurations { for _, c := range configurations {
if c.Metadata.Name == metaName { if c.Metadata.Name == metaName && c.Deleted == false {
return c.DatasetID, nil return c.DatasetID, nil
} }
} }
......
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