Skip to content

Commit

Permalink
Fixes import ordering and comment typo.
Browse files Browse the repository at this point in the history
  • Loading branch information
manadart committed Dec 19, 2019
1 parent 92a3bb4 commit 0b1bfc9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion api/remoterelations/remoterelations_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
package remoterelations_test

import (
"github.com/juju/juju/core/crossmodel"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v3"
Expand All @@ -13,6 +12,7 @@ import (
"github.com/juju/juju/api/remoterelations"
apitesting "github.com/juju/juju/api/testing"
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/core/crossmodel"
"github.com/juju/juju/core/status"
coretesting "github.com/juju/juju/testing"
)
Expand Down
2 changes: 1 addition & 1 deletion rpc/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ func (conn *Conn) Close() error {
conn.mutex.Lock()
if conn.root != nil {
// It is possible that since we last Killed the root, other resources
// may have been added during some of the pending call resoulutions.
// may have been added during some of the pending call resolutions.
// So to release these resources, double tap the root.
conn.root.Kill()
}
Expand Down

0 comments on commit 0b1bfc9

Please sign in to comment.