Skip to content

Commit

Permalink
Merge pull request #479 from nats-io/fix_server_imports
Browse files Browse the repository at this point in the history
Fixed nats-server import paths
  • Loading branch information
kozlovic authored Jun 4, 2019
2 parents b7c46b0 + 2a61c18 commit e2837a2
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion nats.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import (

// Default Constants
const (
Version = "1.8.0"
Version = "1.8.1"
DefaultURL = "nats://127.0.0.1:4222"
DefaultPort = 4222
DefaultMaxReconnect = 60
Expand Down
4 changes: 2 additions & 2 deletions nats_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ import (
"testing"
"time"

"github.com/nats-io/nats-server/server"
natsserver "github.com/nats-io/nats-server/test"
"github.com/nats-io/nats-server/v2/server"
natsserver "github.com/nats-io/nats-server/v2/test"
"github.com/nats-io/nkeys"
)

Expand Down
4 changes: 2 additions & 2 deletions test/auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"testing"
"time"

"github.com/nats-io/nats-server/server"
"github.com/nats-io/nats-server/test"
"github.com/nats-io/nats-server/v2/server"
"github.com/nats-io/nats-server/v2/test"
"github.com/nats-io/nats.go"
)

Expand Down
4 changes: 2 additions & 2 deletions test/cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"testing"
"time"

"github.com/nats-io/nats-server/server"
"github.com/nats-io/nats-server/test"
"github.com/nats-io/nats-server/v2/server"
"github.com/nats-io/nats-server/v2/test"
"github.com/nats-io/nats.go"
)

Expand Down
4 changes: 2 additions & 2 deletions test/conn_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"testing"
"time"

"github.com/nats-io/nats-server/server"
"github.com/nats-io/nats-server/test"
"github.com/nats-io/nats-server/v2/server"
"github.com/nats-io/nats-server/v2/test"
"github.com/nats-io/nats.go"
)

Expand Down
4 changes: 2 additions & 2 deletions test/helper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"strings"
"time"

"github.com/nats-io/nats-server/server"
"github.com/nats-io/nats-server/v2/server"
"github.com/nats-io/nats.go"

natsserver "github.com/nats-io/nats-server/test"
natsserver "github.com/nats-io/nats-server/v2/test"
)

// So that we can pass tests and benchmarks...
Expand Down
2 changes: 1 addition & 1 deletion test/reconnect_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"testing"
"time"

"github.com/nats-io/nats-server/server"
"github.com/nats-io/nats-server/v2/server"
"github.com/nats-io/nats.go"
)

Expand Down

0 comments on commit e2837a2

Please sign in to comment.