diff options
| author | Valeri Karpov <valeri.karpov@10gen.com> | 2014-10-15 10:52:11 -0400 |
|---|---|---|
| committer | Valeri Karpov <valeri.karpov@10gen.com> | 2014-10-16 12:21:02 -0400 |
| commit | 48c67b0949f3f1f094e42e1749bfc51a34116e58 (patch) | |
| tree | f60684219f785b7150c4c8460acd875a4edca045 | |
| parent | 6ac857f6562e21a8b7abd28c14d54f1c4034d020 (diff) | |
| download | mongo-48c67b0949f3f1f094e42e1749bfc51a34116e58.tar.gz | |
TOOLS-278 fix up rebase
Former-commit-id: 4dbb90ad8dbe2365fb8f6656b96e5f658c89bfdb
| -rw-r--r-- | common/testutil/ssl_off_integration.go (renamed from src/github.com/mongodb/mongo-tools/common/testutil/ssl_off_integration.go) | 0 | ||||
| -rw-r--r-- | common/testutil/ssl_on_integration.go (renamed from src/github.com/mongodb/mongo-tools/common/testutil/ssl_on_integration.go) | 0 | ||||
| -rw-r--r-- | mongodump/mongodump_test.go | 2 |
3 files changed, 1 insertions, 1 deletions
diff --git a/src/github.com/mongodb/mongo-tools/common/testutil/ssl_off_integration.go b/common/testutil/ssl_off_integration.go index 7ee48374a66..7ee48374a66 100644 --- a/src/github.com/mongodb/mongo-tools/common/testutil/ssl_off_integration.go +++ b/common/testutil/ssl_off_integration.go diff --git a/src/github.com/mongodb/mongo-tools/common/testutil/ssl_on_integration.go b/common/testutil/ssl_on_integration.go index 4bcd92bbf9a..4bcd92bbf9a 100644 --- a/src/github.com/mongodb/mongo-tools/common/testutil/ssl_on_integration.go +++ b/common/testutil/ssl_on_integration.go diff --git a/mongodump/mongodump_test.go b/mongodump/mongodump_test.go index 793fd068cd5..3d62c491be9 100644 --- a/mongodump/mongodump_test.go +++ b/mongodump/mongodump_test.go @@ -61,7 +61,7 @@ func simpleMongoDumpInstance() *MongoDump { } func getBareSession() (*mgo.Session, error) { - ssl := testutil.GetSSLOptions(), + ssl := testutil.GetSSLOptions() sessionProvider, err := db.InitSessionProvider(commonOpts.ToolOptions{ Connection: &commonOpts.Connection{ Host: testServer, |