diff options
| author | Andy Schwerin <schwerin@mongodb.com> | 2015-05-07 16:45:29 -0400 |
|---|---|---|
| committer | Andy Schwerin <schwerin@mongodb.com> | 2015-05-12 09:57:33 -0400 |
| commit | 9aac625685811873ffbc2d3e8d09531eff1ce10e (patch) | |
| tree | ecd8dd9fc9d148b196c6ab2aa5e38e5f9e327c54 /src/mongo/db/dbcommands.cpp | |
| parent | 21a16d229bdba571f1118a419898b666c666b869 (diff) | |
| download | mongo-9aac625685811873ffbc2d3e8d09531eff1ce10e.tar.gz | |
SERVER-13874 Make mongo::Milliseconds et al. aliases for equivalent stdx::chrono types.
Also introduces operators for adding stdx::chrono::duration to Date_t,
subtracting two Date_ts to get Milliseconds, and remove the use of
reinterpret_cast from the implementation of BSON Timestamp type.
Diffstat (limited to 'src/mongo/db/dbcommands.cpp')
| -rw-r--r-- | src/mongo/db/dbcommands.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/dbcommands.cpp b/src/mongo/db/dbcommands.cpp index 89159347ed0..c59661c2e4d 100644 --- a/src/mongo/db/dbcommands.cpp +++ b/src/mongo/db/dbcommands.cpp @@ -136,8 +136,8 @@ namespace mongo { Status status = repl::getGlobalReplicationCoordinator()->stepDown( txn, force, - repl::ReplicationCoordinator::Milliseconds(timeoutSecs * 1000), - repl::ReplicationCoordinator::Milliseconds(120 * 1000)); + Seconds(timeoutSecs), + Seconds(120)); if (!status.isOK() && status.code() != ErrorCodes::NotMaster) { // ignore not master return appendCommandStatus(result, status); } |