diff options
| author | William Schultz <william.schultz@mongodb.com> | 2018-04-05 14:08:19 -0400 |
|---|---|---|
| committer | William Schultz <william.schultz@mongodb.com> | 2018-04-05 14:08:27 -0400 |
| commit | a5dacf7092f51055dd774a1911a48815bb9a1e0e (patch) | |
| tree | f8c456387a0f0dca86bfbf379e4c1f3c4b9c4657 | |
| parent | 9da53de7efe7230cc7b3e957e869f94693d7b802 (diff) | |
| download | mongo-a5dacf7092f51055dd774a1911a48815bb9a1e0e.tar.gz | |
Fix merge conflict errors
| -rw-r--r-- | src/mongo/s/commands/cluster_aggregate.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mongo/s/commands/cluster_aggregate.cpp b/src/mongo/s/commands/cluster_aggregate.cpp index 7c673f73b30..242cbc3c10c 100644 --- a/src/mongo/s/commands/cluster_aggregate.cpp +++ b/src/mongo/s/commands/cluster_aggregate.cpp @@ -282,7 +282,6 @@ std::vector<ClusterClientCursorParams::RemoteCursor> establishShardCursors( const ReadPreferenceSetting& readPref, const BSONObj& shardQuery, const BSONObj& collation) { ->>>>>>> parent of 7d09f27... SERVER-33323 Use the IDL to serialize the ARM LOG(1) << "Dispatching command " << redact(cmdObj) << " to establish cursors on shards"; bool mustRunOnAll = mustRunOnAllShards(nss, *routingInfo, litePipe); |