summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamon Fernandez <ramon.fernandez@mongodb.com>2015-02-09 16:38:56 -0500
committerRamon Fernandez <ramon.fernandez@mongodb.com>2015-02-09 16:50:53 -0500
commit43ea13bb5995ed1a1907ccb9f49b76daba2b27b2 (patch)
tree92c0d1df830df18bde41810eb229d5f477148898
parent7f5df52b3a48b1ab028e8453443de67f8fe46155 (diff)
downloadmongo-43ea13bb5995ed1a1907ccb9f49b76daba2b27b2.tar.gz
SERVER-17022 Update assert code to avoid conflicts in v3.0 branch
(cherry picked from commit e6e989f7fcf70d5bf5a5645b6927ac7a889dd5b7)
-rw-r--r--src/mongo/util/net/ssl_manager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/util/net/ssl_manager.cpp b/src/mongo/util/net/ssl_manager.cpp
index 4460abbe78b..cec95e4ee51 100644
--- a/src/mongo/util/net/ssl_manager.cpp
+++ b/src/mongo/util/net/ssl_manager.cpp
@@ -595,7 +595,7 @@ namespace mongo {
// Note: this is for blocking sockets only.
SSL_CTX_set_mode(*context, SSL_MODE_AUTO_RETRY);
- massert(28606,
+ massert(28607,
mongoutils::str::stream() << "can't store ssl session id context: " <<
getSSLErrorMessage(ERR_get_error()),
SSL_CTX_set_session_id_context(