summaryrefslogtreecommitdiff
path: root/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp
diff options
context:
space:
mode:
authorMartin Neupauer <martin.neupauer@mongodb.com>2018-03-14 10:48:32 -0400
committerMartin Neupauer <martin.neupauer@mongodb.com>2018-03-14 10:57:27 -0400
commitebbd763514514d3ed77c25477c61d71df0d91420 (patch)
tree334ccd40f276af40d9b25dcb20e333ee2831548c /src/mongo/db/s/config/configsvr_merge_chunk_command.cpp
parent6b01ee246abc2793f711e6edce192585ca7f8609 (diff)
downloadmongo-ebbd763514514d3ed77c25477c61d71df0d91420.tar.gz
Revert "SERVER-33455 SERVER-33452 - Add history to the chunk type and update move/split/merge methods."
This reverts commit 5b42a86b74380953db29455dc68e133166c81005.
Diffstat (limited to 'src/mongo/db/s/config/configsvr_merge_chunk_command.cpp')
-rw-r--r--src/mongo/db/s/config/configsvr_merge_chunk_command.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp b/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp
index 91c7fe9de31..74d11ef2eb5 100644
--- a/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp
+++ b/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp
@@ -114,8 +114,7 @@ public:
parsedRequest.getNamespace(),
parsedRequest.getEpoch(),
parsedRequest.getChunkBoundaries(),
- parsedRequest.getShardName(),
- parsedRequest.getValidAfter());
+ parsedRequest.getShardName());
if (!mergeChunkResult.isOK()) {
return CommandHelpers::appendCommandStatus(result, mergeChunkResult);