← Back to branch summary

~themue/juju-core/053-env-more-script-friendly

« back to all changes in this revision

Viewing changes to state/api/client.go

Merge trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
state/api/client.go
8
8
        "launchpad.net/juju-core/cert"
9
9
        "launchpad.net/juju-core/log"
10
10
        "launchpad.net/juju-core/rpc"
11
 
        "launchpad.net/juju-core/trivial"
 
11
        "launchpad.net/juju-core/utils"
12
12
        "time"
13
13
)
14
14
 
37
37
        Password string
38
38
}
39
39
 
40
 
var openAttempt = trivial.AttemptStrategy{
 
40
var openAttempt = utils.AttemptStrategy{
41
41
        Total: 5 * time.Minute,
42
42
        Delay: 500 * time.Millisecond,
43
43
}