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:53:25 -0500
commit1dd33f490c47f8e4bc01f11931b62a463fe4fbca (patch)
treef8ca05f5e080a1a42a2f006b8405f5369e3a1f8f
parentfba5adfea43de38102eb0cf7abc5cbd0523398ba (diff)
downloadmongo-1dd33f490c47f8e4bc01f11931b62a463fe4fbca.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 a38aa79a67e..40682822d1c 100644
--- a/src/mongo/util/net/ssl_manager.cpp
+++ b/src/mongo/util/net/ssl_manager.cpp
@@ -546,7 +546,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(