Skip to content

Commit

Permalink
Preparing release of v2 r2015.01.24.
Browse files Browse the repository at this point in the history
  • Loading branch information
niemeyer committed Jan 24, 2015
1 parent 5070508 commit c6a7dce
Show file tree
Hide file tree
Showing 23 changed files with 41 additions and 41 deletions.
4 changes: 2 additions & 2 deletions auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import (
"fmt"
"sync"

"gopkg.in/mgo.v2-unstable/bson"
"gopkg.in/mgo.v2-unstable/internal/scram"
"gopkg.in/mgo.v2/bson"
"gopkg.in/mgo.v2/internal/scram"
)

type authCmd struct {
Expand Down
2 changes: 1 addition & 1 deletion auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import (
"time"

. "gopkg.in/check.v1"
"gopkg.in/mgo.v2-unstable"
"gopkg.in/mgo.v2"
)

func (s *S) TestAuthLoginDatabase(c *C) {
Expand Down
14 changes: 7 additions & 7 deletions bson/bson_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
"time"

. "gopkg.in/check.v1"
"gopkg.in/mgo.v2-unstable/bson"
"gopkg.in/mgo.v2/bson"
)

func TestAll(t *testing.T) {
Expand Down Expand Up @@ -1476,14 +1476,14 @@ var jsonIdTests = []struct {
marshal: false,
unmarshal: true,
}, {
json: `{"Id":"4d88e15b60f486e428412dc9A"}`,
error: `Invalid ObjectId in JSON: "4d88e15b60f486e428412dc9A"`,
marshal: false,
json: `{"Id":"4d88e15b60f486e428412dc9A"}`,
error: `Invalid ObjectId in JSON: "4d88e15b60f486e428412dc9A"`,
marshal: false,
unmarshal: true,
}, {
json: `{"Id":"4d88e15b60f486e428412dcZ"}`,
error: `Invalid ObjectId in JSON: "4d88e15b60f486e428412dcZ" .*`,
marshal: false,
json: `{"Id":"4d88e15b60f486e428412dcZ"}`,
error: `Invalid ObjectId in JSON: "4d88e15b60f486e428412dcZ" .*`,
marshal: false,
unmarshal: true,
}}

Expand Down
2 changes: 1 addition & 1 deletion bulk_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ package mgo_test

import (
. "gopkg.in/check.v1"
"gopkg.in/mgo.v2-unstable"
"gopkg.in/mgo.v2"
)

func (s *S) TestBulkInsert(c *C) {
Expand Down
2 changes: 1 addition & 1 deletion cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"sync"
"time"

"gopkg.in/mgo.v2-unstable/bson"
"gopkg.in/mgo.v2/bson"
)

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

. "gopkg.in/check.v1"
"gopkg.in/mgo.v2-unstable"
"gopkg.in/mgo.v2-unstable/bson"
"gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"
)

func (s *S) TestNewSession(c *C) {
Expand Down
2 changes: 1 addition & 1 deletion gridfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
"sync"
"time"

"gopkg.in/mgo.v2-unstable/bson"
"gopkg.in/mgo.v2/bson"
)

type GridFS struct {
Expand Down
4 changes: 2 additions & 2 deletions gridfs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"time"

. "gopkg.in/check.v1"
"gopkg.in/mgo.v2-unstable"
"gopkg.in/mgo.v2-unstable/bson"
"gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"
)

func (s *S) TestGridFSCreate(c *C) {
Expand Down
2 changes: 1 addition & 1 deletion internal/scram/scram_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

. "gopkg.in/check.v1"
"gopkg.in/mgo.v2-unstable/internal/scram"
"gopkg.in/mgo.v2/internal/scram"
"strings"
)

Expand Down
2 changes: 1 addition & 1 deletion saslimpl.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package mgo

import (
"gopkg.in/mgo.v2-unstable/sasl"
"gopkg.in/mgo.v2/sasl"
)

func saslNew(cred Credential, host string) (saslStepper, error) {
Expand Down
2 changes: 1 addition & 1 deletion server.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"sync"
"time"

"gopkg.in/mgo.v2-unstable/bson"
"gopkg.in/mgo.v2/bson"
)

// ---------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion session.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import (
"sync"
"time"

"gopkg.in/mgo.v2-unstable/bson"
"gopkg.in/mgo.v2/bson"
)

type mode int
Expand Down
6 changes: 3 additions & 3 deletions session_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ import (
"time"

. "gopkg.in/check.v1"
"gopkg.in/mgo.v2-unstable"
"gopkg.in/mgo.v2-unstable/bson"
"gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"
)

func (s *S) TestRunString(c *C) {
Expand Down Expand Up @@ -2567,7 +2567,7 @@ var indexTests = []struct {
},
}, {
mgo.Index{
Key: []string{"$text:$**"},
Key: []string{"$text:$**"},
},
M{
"name": "$**_text",
Expand Down
2 changes: 1 addition & 1 deletion socket.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"sync"
"time"

"gopkg.in/mgo.v2-unstable/bson"
"gopkg.in/mgo.v2/bson"
)

type replyFunc func(err error, reply *replyOp, docNum int, docData []byte)
Expand Down
4 changes: 2 additions & 2 deletions suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ import (
"time"

. "gopkg.in/check.v1"
"gopkg.in/mgo.v2-unstable"
"gopkg.in/mgo.v2-unstable/bson"
"gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"
)

var fast = flag.Bool("fast", false, "Skip slow tests")
Expand Down
2 changes: 1 addition & 1 deletion txn/debug.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sort"
"sync/atomic"

"gopkg.in/mgo.v2-unstable/bson"
"gopkg.in/mgo.v2/bson"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions txn/flusher.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package txn
import (
"fmt"

"gopkg.in/mgo.v2-unstable"
"gopkg.in/mgo.v2-unstable/bson"
"gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"
)

func flush(r *Runner, t *transaction) error {
Expand Down
2 changes: 1 addition & 1 deletion txn/mgo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package txn_test

import (
"bytes"
"gopkg.in/mgo.v2-unstable"
"gopkg.in/mgo.v2"
. "gopkg.in/check.v1"
"os/exec"
"time"
Expand Down
6 changes: 3 additions & 3 deletions txn/sim_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package txn_test

import (
"flag"
"gopkg.in/mgo.v2-unstable"
"gopkg.in/mgo.v2-unstable/bson"
"gopkg.in/mgo.v2-unstable/txn"
"gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"
"gopkg.in/mgo.v2/txn"
. "gopkg.in/check.v1"
"math/rand"
"time"
Expand Down
2 changes: 1 addition & 1 deletion txn/tarjan.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package txn

import (
"gopkg.in/mgo.v2-unstable/bson"
"gopkg.in/mgo.v2/bson"
"sort"
)

Expand Down
2 changes: 1 addition & 1 deletion txn/tarjan_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package txn

import (
"fmt"
"gopkg.in/mgo.v2-unstable/bson"
"gopkg.in/mgo.v2/bson"
. "gopkg.in/check.v1"
)

Expand Down
4 changes: 2 additions & 2 deletions txn/txn.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strings"
"sync"

"gopkg.in/mgo.v2-unstable"
"gopkg.in/mgo.v2-unstable/bson"
"gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"

crand "crypto/rand"
mrand "math/rand"
Expand Down
6 changes: 3 additions & 3 deletions txn/txn_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"time"

. "gopkg.in/check.v1"
"gopkg.in/mgo.v2-unstable"
"gopkg.in/mgo.v2-unstable/bson"
"gopkg.in/mgo.v2-unstable/txn"
"gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"
"gopkg.in/mgo.v2/txn"
)

func TestAll(t *testing.T) {
Expand Down

0 comments on commit c6a7dce

Please sign in to comment.