summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndy Schwerin <schwerin@mongodb.com>2015-12-21 18:12:34 -0500
committerSpencer T Brody <spencer@mongodb.com>2016-01-21 16:34:55 -0500
commit3400f82a11ad01d52b9c4e2991d3aaa63b61ef04 (patch)
tree74e9dfa26133deceaae9f23237fa2ad66577a889 /src
parent59218cfc3c0311e55570938b594814137bbaf998 (diff)
downloadmongo-3400f82a11ad01d52b9c4e2991d3aaa63b61ef04.tar.gz
SERVER-21958 Fix lint error
(cherry picked from commit 3323bd3d86cf2ac724a5a2fc066ffcee9a176193)
Diffstat (limited to 'src')
-rw-r--r--src/mongo/db/commands/clone_collection.cpp3
-rw-r--r--src/mongo/db/repl/rollback_source_impl.cpp9
2 files changed, 5 insertions, 7 deletions
diff --git a/src/mongo/db/commands/clone_collection.cpp b/src/mongo/db/commands/clone_collection.cpp
index 5f3e21008e2..dbbe117f97d 100644
--- a/src/mongo/db/commands/clone_collection.cpp
+++ b/src/mongo/db/commands/clone_collection.cpp
@@ -154,8 +154,7 @@ public:
cloner.setConnection(myconn.release());
- return cloner.copyCollection(
- txn, collection, query, errmsg, copyIndexes);
+ return cloner.copyCollection(txn, collection, query, errmsg, copyIndexes);
}
} cmdCloneCollection;
diff --git a/src/mongo/db/repl/rollback_source_impl.cpp b/src/mongo/db/repl/rollback_source_impl.cpp
index 0e1256a8d7a..443e242deb2 100644
--- a/src/mongo/db/repl/rollback_source_impl.cpp
+++ b/src/mongo/db/repl/rollback_source_impl.cpp
@@ -77,11 +77,10 @@ void RollbackSourceImpl::copyCollectionFromRemote(OperationContext* txn,
// cloner owns _conn in unique_ptr
Cloner cloner;
cloner.setConnection(tmpConn.release());
- uassert(
- 15909,
- str::stream() << "replSet rollback error resyncing collection " << nss.ns() << ' '
- << errmsg,
- cloner.copyCollection(txn, nss.ns(), BSONObj(), errmsg, true));
+ uassert(15909,
+ str::stream() << "replSet rollback error resyncing collection " << nss.ns() << ' '
+ << errmsg,
+ cloner.copyCollection(txn, nss.ns(), BSONObj(), errmsg, true));
}
StatusWith<BSONObj> RollbackSourceImpl::getCollectionInfo(const NamespaceString& nss) const {