~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/provider/gce/google/raw.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
26
26
                Total: 5 * time.Minute,
27
27
                Delay: 2 * time.Second,
28
28
        }
29
 
        attemptsShort = utils.AttemptStrategy{
30
 
                Total: 1 * time.Minute,
31
 
                Delay: 1 * time.Second,
32
 
        }
33
29
)
34
30
 
35
31
func convertRawAPIError(err error) error {