~james-page/ubuntu/wily/juju-core/mir-fixes

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/api/apiclient.go

  • Committer: Package Import Robot
  • Author(s): Curtis C. Hovey
  • Date: 2015-06-05 17:40:37 UTC
  • mfrom: (1.1.34)
  • Revision ID: package-import@ubuntu.com-20150605174037-lcv12myq9gu4194e
Tags: 1.22.5-0ubuntu1
* New upstream bugfix release (Lp: #1462001).
* d/copyright: Updated to reflect changes in the codebase.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
        "strings"
12
12
        "time"
13
13
 
14
 
        "code.google.com/p/go.net/websocket"
15
14
        "github.com/juju/loggo"
16
15
        "github.com/juju/names"
17
16
        "github.com/juju/utils"
18
17
        "github.com/juju/utils/parallel"
 
18
        "golang.org/x/net/websocket"
19
19
 
20
20
        "github.com/juju/juju/apiserver/params"
21
21
        "github.com/juju/juju/cert"