Merge pull request #4767 from monkeylittleinc/v0.6.9-branch

Add support for multiple final states on the WaitForState resource
This commit is contained in:
James Nugent 2016-01-21 18:19:52 -05:00
commit e640a03d07
2 changed files with 2 additions and 2 deletions

View File

@ -418,7 +418,7 @@ func WaitForDropletAttribute(
stateConf := &resource.StateChangeConf{
Pending: pending,
Target: target,
Target: []string{target},
Refresh: newDropletStateRefreshFunc(d, attribute, meta),
Timeout: 60 * time.Minute,
Delay: 10 * time.Second,

View File

@ -167,7 +167,7 @@ func waitForFloatingIPReady(
stateConf := &resource.StateChangeConf{
Pending: pending,
Target: target,
Target: []string{target},
Refresh: newFloatingIPStateRefreshFunc(d, attribute, meta, actionId),
Timeout: 60 * time.Minute,
Delay: 10 * time.Second,