Changes all relevant instances of 2.8 to 3.0

22 files changed, 36 insertions, 36 deletions

diff --git a/src/mongo/client/dbclient.cpp b/src/mongo/client/dbclient.cpp
index f9b6e05247b..9ca2c547a50 100644
--- a/src/mongo/client/dbclient.cpp
+++ b/src/mongo/client/dbclient.cpp
@@ -903,9 +903,9 @@ namespace mongo {
         list<BSONObj> infos;
 
         // first we're going to try the command
-        // it was only added in 2.8, so if we're talking to an older server
+        // it was only added in 3.0, so if we're talking to an older server
         // we'll fail back to querying system.namespaces
-        // TODO(spencer): remove fallback behavior after 2.8
+        // TODO(spencer): remove fallback behavior after 3.0 
 
         {
             BSONObj res;
@@ -1407,7 +1407,7 @@ namespace mongo {
         }
 
         // fallback to querying system.indexes
-        // TODO(spencer): Remove fallback behavior after 2.8
+        // TODO(spencer): Remove fallback behavior after 3.0
         auto_ptr<DBClientCursor> cursor = query(NamespaceString(ns).getSystemIndexesCollection(),
                                                 BSON("ns" << ns), 0, 0, 0, options);
         while ( cursor->more() ) {
diff --git a/src/mongo/db/auth/authorization_manager.cpp b/src/mongo/db/auth/authorization_manager.cpp
index 0dcc7c34568..6182b5745ad 100644
--- a/src/mongo/db/auth/authorization_manager.cpp
+++ b/src/mongo/db/auth/authorization_manager.cpp
@@ -760,7 +760,7 @@ namespace {
         BSONElement credentialsElement = userDoc["credentials"];
         uassert(18806,
                 mongoutils::str::stream() << "While preparing to upgrade user doc from "
-                        "2.6/2.8 user data schema to the 2.8 SCRAM only schema, found a user doc "
+                        "2.6/3.0 user data schema to the 3.0 SCRAM only schema, found a user doc "
                         "with missing or incorrectly formatted credentials: "
                         << userDoc.toString(),
                         credentialsElement.type() == Object);
@@ -777,7 +777,7 @@ namespace {
 
         uassert(18744,
                 mongoutils::str::stream() << "While preparing to upgrade user doc from "
-                        "2.6/2.8 user data schema to the 2.8 SCRAM only schema, found a user doc "
+                        "2.6/3.0 user data schema to the 3.0 SCRAM only schema, found a user doc "
                         "missing MONGODB-CR credentials :"
                         << userDoc.toString(),
                 !mongoCRElement.eoo());
diff --git a/src/mongo/db/auth/authorization_manager.h b/src/mongo/db/auth/authorization_manager.h
index 99c3648178e..cd6e5802221 100644
--- a/src/mongo/db/auth/authorization_manager.h
+++ b/src/mongo/db/auth/authorization_manager.h
@@ -121,13 +121,13 @@ namespace mongo {
         static const int schemaVersion26Upgrade = 2;
 
         /**
-         * Auth schema version for MongoDB 2.6 and 2.8 MONGODB-CR/SCRAM mixed auth mode.
+         * Auth schema version for MongoDB 2.6 and 3.0 MONGODB-CR/SCRAM mixed auth mode.
          * Users are stored in admin.system.users, roles in admin.system.roles.
          */
         static const int schemaVersion26Final = 3;
 
         /**
-         * Auth schema version for MongoDB 2.8 SCRAM only mode.
+         * Auth schema version for MongoDB 3.0 SCRAM only mode.
          * Users are stored in admin.system.users, roles in admin.system.roles.
          * MONGODB-CR credentials have been replaced with SCRAM credentials in the user documents.
          */
diff --git a/src/mongo/db/auth/internal_user_auth.cpp b/src/mongo/db/auth/internal_user_auth.cpp
index 97bae3c763b..36e5617a181 100644
--- a/src/mongo/db/auth/internal_user_auth.cpp
+++ b/src/mongo/db/auth/internal_user_auth.cpp
@@ -66,7 +66,7 @@ namespace mongo {
             return;
         }
 
-        // Create authParams for legacy MONGODB-CR authentication for 2.6/2.8 mixed
+        // Create authParams for legacy MONGODB-CR authentication for 2.6/3.0 mixed
         // mode if applicable.
         mmb::Document fallback(authParamsIn);
         fallback.root().findFirstChildNamed("mechanism").setValueString("MONGODB-CR");
diff --git a/src/mongo/db/auth/sasl_commands.cpp b/src/mongo/db/auth/sasl_commands.cpp
index ae773dd17e3..00096f1bf22 100644
--- a/src/mongo/db/auth/sasl_commands.cpp
+++ b/src/mongo/db/auth/sasl_commands.cpp
@@ -368,7 +368,7 @@ namespace {
         if (!sequenceContains(saslGlobalParams.authenticationMechanisms, "MONGODB-X509"))
             CmdAuthenticate::disableAuthMechanism("MONGODB-X509");
 
-        // For backwards compatibility, in 2.8 we are letting MONGODB-CR imply general
+        // For backwards compatibility, in 3.0 we are letting MONGODB-CR imply general
         // challenge-response auth and hence SCRAM-SHA-1 is enabled by either specifying
         // SCRAM-SHA-1 or MONGODB-CR in the authenticationMechanism server parameter.
         if (!sequenceContains(saslGlobalParams.authenticationMechanisms, "SCRAM-SHA-1") &&
diff --git a/src/mongo/db/clientcursor.cpp b/src/mongo/db/clientcursor.cpp
index 02e66852a27..370bbf40683 100644
--- a/src/mongo/db/clientcursor.cpp
+++ b/src/mongo/db/clientcursor.cpp
@@ -320,7 +320,7 @@ namespace mongo {
 
     // QUESTION: Restrict to the namespace from which this command was issued?
     // Alternatively, make this command admin-only?
-    // TODO: remove this for 2.8
+    // TODO: remove this for 3.0
     class CmdCursorInfo : public Command {
     public:
         CmdCursorInfo() : Command( "cursorInfo", true ) {}
diff --git a/src/mongo/db/commands/writeback_compatibility_shim.cpp b/src/mongo/db/commands/writeback_compatibility_shim.cpp
index 7441ed5d273..63bb3ba2718 100644
--- a/src/mongo/db/commands/writeback_compatibility_shim.cpp
+++ b/src/mongo/db/commands/writeback_compatibility_shim.cpp
@@ -49,7 +49,7 @@ namespace mongo {
     using mongoutils::str::stream;
 
     /**
-     * This command is required in v2.8 mongod to prevent v2.6 mongos from entering a tight loop and
+     * This command is required in v3.0 mongod to prevent v2.6 mongos from entering a tight loop and
      * spamming the server with invalid writebacklisten requests.  This command reports an error
      * and pauses, which is safe because the original v2.6 WBL command was a long-poll (30s).
      */
@@ -58,7 +58,7 @@ namespace mongo {
         WriteBackCommand() : Command("writebacklisten") {}
 
         void help(stringstream& helpOut) const {
-            helpOut << "v2.8 disallowed internal command, present for compatibility only";
+            helpOut << "v3.0 disallowed internal command, present for compatibility only";
         }
 
         virtual bool isWriteCommandForConfigServer() const { return false; }
@@ -82,8 +82,8 @@ namespace mongo {
                          const string&, BSONObj&, int, string&, BSONObjBuilder& result, bool) {
 
             string errMsg = stream()
-                << "Writeback functionality is no longer present in v2.8 mongod, "
-                << "a v2.6 mongos may be running in the v2.8 cluster at "
+                << "Writeback functionality is no longer present in v3.0 mongod, "
+                << "a v2.6 mongos may be running in the v3.0 cluster at "
                 << opCtx->getClient()->clientAddress(false);
 
             error() << errMsg;
diff --git a/src/mongo/db/repl/handshake_args.cpp b/src/mongo/db/repl/handshake_args.cpp
index 9a81c4ddadf..db815ee3aa2 100644
--- a/src/mongo/db/repl/handshake_args.cpp
+++ b/src/mongo/db/repl/handshake_args.cpp
@@ -41,7 +41,7 @@ namespace repl {
 namespace {
 
     const std::string kRIDFieldName = "handshake";
-    // TODO(danneberg) remove after 2.8 since this field is only allowed for backwards compatibility
+    // TODO(danneberg) remove after 3.0 since this field is only allowed for backwards compatibility
     const std::string kOldMemberConfigFieldName = "config";
     const std::string kMemberIdFieldName = "member";
 
diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp
index 1d7784c7b9c..b15d12f5f24 100644
--- a/src/mongo/db/repl/replication_coordinator_impl.cpp
+++ b/src/mongo/db/repl/replication_coordinator_impl.cpp
@@ -764,7 +764,7 @@ namespace {
         }
         else {
             // The command we received didn't contain a memberId, most likely this is because it
-            // came from a member running something prior to 2.8.
+            // came from a member running something prior to 3.0.
             // Fall back to finding the node by RID.
             slaveInfo = _findSlaveInfoByRID_inlock(args.rid);
             if (!slaveInfo) {
@@ -1333,9 +1333,9 @@ namespace {
                 entry.append("optime", itr->opTime);
                 entry.append("memberId", itr->memberId);
                 entry.append("cfgver", _rsConfig.getConfigVersion());
-                // SERVER-14550 Even though the "config" field isn't used on the other end in 2.8,
+                // SERVER-14550 Even though the "config" field isn't used on the other end in 3.0,
                 // we need to keep sending it for 2.6 compatibility.
-                // TODO(spencer): Remove this after 2.8 is released.
+                // TODO(spencer): Remove this after 3.0 is released.
                 const MemberConfig* member = _rsConfig.findMemberByID(itr->memberId);
                 fassert(18651, member); // We ensured the member existed in processHandshake.
                 entry.append("config", member->toBSON(_rsConfig.getTagConfig()));
@@ -1360,9 +1360,9 @@ namespace {
                 BSONObjBuilder subCmd (cmd.subobjStart("handshake"));
                 subCmd.append("handshake", itr->rid);
                 subCmd.append("member", itr->memberId);
-                // SERVER-14550 Even though the "config" field isn't used on the other end in 2.8,
+                // SERVER-14550 Even though the "config" field isn't used on the other end in 3.0,
                 // we need to keep sending it for 2.6 compatibility.
-                // TODO(spencer): Remove this after 2.8 is released.
+                // TODO(spencer): Remove this after 3.0 is released.
                 const MemberConfig* member = _rsConfig.findMemberByID(itr->memberId);
                 fassert(18650, member); // We ensured the member existed in processHandshake.
                 subCmd.append("config", member->toBSON(_rsConfig.getTagConfig()));
diff --git a/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp b/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp
index 76a023670e0..f80d2a5c1a7 100644
--- a/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp
+++ b/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp
@@ -183,7 +183,7 @@ namespace {
 
         SlaveInfo& slaveInfo = _slaveInfo[targetIndex];
         if (optime > slaveInfo.opTime && slaveInfo.rid.isSet()) {
-            // TODO(spencer): The second part of the above if-statement can be removed after 2.8
+            // TODO(spencer): The second part of the above if-statement can be removed after 3.0
             // but for now, to maintain compatibility with 2.6, we can't record optimes for any
             // nodes we haven't heard from via replSetUpdatePosition yet to associate an RID.
             _updateSlaveInfoOptime_inlock(&slaveInfo, optime);
diff --git a/src/mongo/db/repl/sync_source_feedback.cpp b/src/mongo/db/repl/sync_source_feedback.cpp
index 57c747163e5..4c6d2c15ca7 100644
--- a/src/mongo/db/repl/sync_source_feedback.cpp
+++ b/src/mongo/db/repl/sync_source_feedback.cpp
@@ -135,7 +135,7 @@ namespace repl {
                         << errMsg;
 
                     // sleep half a second if we are not in our sync source's config
-                    // TODO(dannenberg) after 2.8, remove the string comparison 
+                    // TODO(dannenberg) after 3.0, remove the string comparison 
                     if (res["code"].numberInt() == ErrorCodes::NodeNotFound ||
                             errMsg.find("could not be found in replica set config while attempting "
                                         "to associate it with") != std::string::npos) {
diff --git a/src/mongo/db/repl/update_position_args.cpp b/src/mongo/db/repl/update_position_args.cpp
index 40ef323e4c9..78b08bfc483 100644
--- a/src/mongo/db/repl/update_position_args.cpp
+++ b/src/mongo/db/repl/update_position_args.cpp
@@ -98,7 +98,7 @@ namespace {
             if (!status.isOK())
                 return status;
 
-            // TODO(spencer): The following three fields are optional in 2.8, but should be made
+            // TODO(spencer): The following three fields are optional in 3.0, but should be made
             // required or ignored in 3.0
             long long cfgver;
             status = bsonExtractIntegerFieldWithDefault(entry, kConfigVersionFieldName, -1, &cfgver);
diff --git a/src/mongo/db/storage/mmap_v1/data_file.h b/src/mongo/db/storage/mmap_v1/data_file.h
index 53c237b6c7e..6d34f4e4a89 100644
--- a/src/mongo/db/storage/mmap_v1/data_file.h
+++ b/src/mongo/db/storage/mmap_v1/data_file.h
@@ -79,7 +79,7 @@ namespace mongo {
         // minor layout:
         // first 4 bits - index plugin cleanliness.
         //    see IndexCatalog::_upgradeDatabaseMinorVersionIfNeeded for details
-        // 5th bit - 1 if started with 2.8-style freelist implementation (SERVER-14081)
+        // 5th bit - 1 if started with 3.0-style freelist implementation (SERVER-14081)
         // 6th through 31st bit - reserved and must be set to 0.
         static const uint32_t kIndexPluginMask = 0xf;
         static const uint32_t kIndexes22AndOlder = 5;
diff --git a/src/mongo/db/storage/mmap_v1/mmap_v1_database_catalog_entry.cpp b/src/mongo/db/storage/mmap_v1/mmap_v1_database_catalog_entry.cpp
index 6554adc5322..0d863afc9b1 100644
--- a/src/mongo/db/storage/mmap_v1/mmap_v1_database_catalog_entry.cpp
+++ b/src/mongo/db/storage/mmap_v1/mmap_v1_database_catalog_entry.cpp
@@ -63,7 +63,7 @@ namespace {
 
     /**
      * Declaration for the "newCollectionsUsePowerOf2Sizes" server parameter, which is now
-     * deprecated in 2.8.
+     * deprecated in 3.0.
      * Note that:
      * - setting to true performs a no-op.
      * - setting to false will fail.
diff --git a/src/mongo/db/storage/mmap_v1/record_store_v1_base.cpp b/src/mongo/db/storage/mmap_v1/record_store_v1_base.cpp
index c5951e25f50..7a331cae3fe 100644
--- a/src/mongo/db/storage/mmap_v1/record_store_v1_base.cpp
+++ b/src/mongo/db/storage/mmap_v1/record_store_v1_base.cpp
@@ -859,7 +859,7 @@ namespace mongo {
                                                double scale ) const {
         result->append( "lastExtentSize", _details->lastExtentSize(txn) / scale );
         result->append( "paddingFactor", 1.0 ); // hard coded
-        result->append( "paddingFactorNote", "paddingFactor is unused and unmaintained in 2.8. It "
+        result->append( "paddingFactorNote", "paddingFactor is unused and unmaintained in 3.0. It "
                                              "remains hard coded to 1.0 for compatibility only." );
         result->append( "userFlags", _details->userFlags() );
         result->appendBool( "capped", isCapped() );
diff --git a/src/mongo/installer/msi/SConscript b/src/mongo/installer/msi/SConscript
index 795cf9cceba..6468bd9d155 100644
--- a/src/mongo/installer/msi/SConscript
+++ b/src/mongo/installer/msi/SConscript
@@ -94,7 +94,7 @@ major_version = "%s.%s" % (mv[0], mv[1])
 # (msi_edition, msi_platform, msi_flavor) combination
 # and change MSI ProductId on minor updates, 2.6.0 -> 2.6.1, we let Wix do automatic
 # GUID generation for us rather then build a database of GUIDs in our build system
-# For major updates, we are going to create a new directory/productid/upgrade_code ie, 2.6 -> 2.8
+# For major updates, we are going to create a new directory/productid/upgrade_code ie, 2.6 -> 3.0
 
 
 # candle: compile .wxs files into .wixobjs
diff --git a/src/mongo/s/config_upgrade_helpers.cpp b/src/mongo/s/config_upgrade_helpers.cpp
index 8c5e10fd18c..228d3c27738 100644
--- a/src/mongo/s/config_upgrade_helpers.cpp
+++ b/src/mongo/s/config_upgrade_helpers.cpp
@@ -352,7 +352,7 @@ namespace mongo {
         BSONObjBuilder unsetObj;
         unsetObj.append(VersionType::upgradeId(), 1);
         unsetObj.append(VersionType::upgradeState(), 1);
-        unsetObj.append("version", 1); // remove deprecated field, no longer supported >= v2.8.
+        unsetObj.append("version", 1); // remove deprecated field, no longer supported >= v3.0.
 
         Status result = clusterUpdate(VersionType::ConfigNS,
                 BSON("_id" << 1 << VersionType::currentVersion(currentVersion)),
diff --git a/src/mongo/s/d_migrate.cpp b/src/mongo/s/d_migrate.cpp
index c940aef971e..9b387e0bcf7 100644
--- a/src/mongo/s/d_migrate.cpp
+++ b/src/mongo/s/d_migrate.cpp
@@ -1168,7 +1168,7 @@ namespace mongo {
                 return false;
             }
 
-            // From mongos >= v2.8.
+            // From mongos >= v3.0.
             BSONElement epochElem(cmdObj["epoch"]);
             if (epochElem.type() == jstOID) {
                 OID cmdEpoch = epochElem.OID();
diff --git a/src/mongo/s/d_split.cpp b/src/mongo/s/d_split.cpp
index 56d59e4ffd1..eaaf9926997 100644
--- a/src/mongo/s/d_split.cpp
+++ b/src/mongo/s/d_split.cpp
@@ -638,7 +638,7 @@ namespace mongo {
                 return false;
             }
 
-            // From mongos >= v2.8.
+            // From mongos >= v3.0.
             BSONElement epochElem(cmdObj["epoch"]);
             if (epochElem.type() == jstOID) {
                 OID cmdEpoch = epochElem.OID();
diff --git a/src/mongo/s/d_state.cpp b/src/mongo/s/d_state.cpp
index 4e60b4b2aeb..994f2b46364 100644
--- a/src/mongo/s/d_state.cpp
+++ b/src/mongo/s/d_state.cpp
@@ -990,13 +990,13 @@ namespace mongo {
 
         bool run(OperationContext* txn, const string& , BSONObj& cmdObj, int, string& errmsg, BSONObjBuilder& result, bool) {
 
-            // Compatibility error for < v2.8 mongoses still active in the cluster
-            // TODO: Remove post-2.8
+            // Compatibility error for < v3.0 mongoses still active in the cluster
+            // TODO: Remove post-3.0
             if (!cmdObj["serverID"].eoo()) {
 
                 // This mongos is too old to talk to us
-                string errMsg = stream() << "v2.8 mongod is incompatible with v2.6 mongos, "
-                                         << "a v2.6 mongos may be running in the v2.8 cluster at "
+                string errMsg = stream() << "v3.0 mongod is incompatible with v2.6 mongos, "
+                                         << "a v2.6 mongos may be running in the v3.0 cluster at "
                                          << txn->getClient()->clientAddress(false);
                 error() << errMsg;
                 return appendCommandStatus(result, Status(ErrorCodes::ProtocolError, errMsg));
diff --git a/src/mongo/shell/db.js b/src/mongo/shell/db.js
index 1f1fb5fb1a2..c60e579c0d5 100644
--- a/src/mongo/shell/db.js
+++ b/src/mongo/shell/db.js
@@ -118,7 +118,7 @@ DB.prototype.createCollection = function(name, opt) {
     var sendFlags = false;
     var flags = 0;
     if (options.usePowerOf2Sizes != undefined) {
-        print("WARNING: The 'usePowerOf2Sizes' flag is ignored in 2.8 and higher as all MMAPv1 "
+        print("WARNING: The 'usePowerOf2Sizes' flag is ignored in 3.0 and higher as all MMAPv1 "
             + "collections use fixed allocation sizes unless the 'noPadding' flag is specified");
 
         sendFlags = true;
diff --git a/src/mongo/shell/servers.js b/src/mongo/shell/servers.js
index 3727cb3be02..db40e2957c4 100755
--- a/src/mongo/shell/servers.js
+++ b/src/mongo/shell/servers.js
@@ -112,7 +112,7 @@ MongoRunner.VersionSub = function(regex, version) {
 // version string to support the dev/stable MongoDB release cycle.
 MongoRunner.binVersionSubs = [ new MongoRunner.VersionSub(/^latest$/, ""),
                                new MongoRunner.VersionSub(/^oldest-supported$/, "1.8"),
-                               // To-be-updated when 2.8 becomes available
+                               // To-be-updated when 3.0 becomes available
                                new MongoRunner.VersionSub(/^last-stable$/, "2.6"),
                                // Latest unstable and next stable are effectively the
                                // same release