Updated version and history to V2.2.10

Author: christkv

HISTORY.md

@@ -1,3 +1,17 @@
+2.2.10 2016-09-15
+-----------------
+* Updated mongodb-core to 2.0.12.
+* fix debug logging message not printing server name.
+* fixed application metadata being sent by wrong ismaster.
+* NODE-812 Fixed mongos stall due to proxy monitoring ismaster failure causing reconnect.
+* NODE-818 Replicaset timeouts in initial connect sequence can "no primary found".
+* Updated bson library to 0.5.5.
+* Added DBPointer up conversion to DBRef.
+* MongoDB 3.4-RC Pass **appname** through MongoClient.connect uri or options to allow metadata to be passed.
+* MongoDB 3.4-RC Pass collation options on update, findOne, find, createIndex, aggregate.
+* MongoDB 3.4-RC Allow write concerns to be passed to all supporting server commands.
+* MongoDB 3.4-RC Allow passing of **servername** as SSL options to support SNI.
+
 2.2.9 2016-08-29
 ----------------
 * Updated mongodb-core to 2.0.11.

lib/collection.js

@@ -1061,6 +1061,7 @@ var updateDocuments = function(self, selector, document, options, callback) {
  * @param {boolean} [options.upsert=false] Update operation is an upsert.
  * @param {boolean} [options.multi=false] Update one/all documents with operation.
  * @param {boolean} [options.bypassDocumentValidation=false] Allow driver to bypass schema validation in MongoDB 3.2 or higher.
+ * @param {object} [options.collation=null] Specify collation (MongoDB 3.4 or higher) settings for update operation (see 3.4 documentation for available fields).
  * @param {Collection~writeOpCallback} [callback] The command result callback
  * @throws {MongoError}
  * @return {Promise} returns Promise if no callback passed
@@ -1372,6 +1373,7 @@ define.classMethod('save', {callback: true, promise:true});
  * @param {(ReadPreference|string)} [options.readPreference=null] The preferred read preference (ReadPreference.PRIMARY, ReadPreference.PRIMARY_PREFERRED, ReadPreference.SECONDARY, ReadPreference.SECONDARY_PREFERRED, ReadPreference.NEAREST).
  * @param {boolean} [options.partial=false] Specify if the cursor should return partial results when querying against a sharded system
  * @param {number} [options.maxTimeMS=null] Number of miliseconds to wait before aborting the query.
+ * @param {object} [options.collation=null] Specify collation (MongoDB 3.4 or higher) settings for update operation (see 3.4 documentation for available fields).
  * @param {Collection~resultCallback} [callback] The command result callback
  * @return {Promise} returns Promise if no callback passed
  */
@@ -1574,6 +1576,7 @@ define.classMethod('isCapped', {callback: true, promise:true});
  * @param {number} [options.v=null] Specify the format version of the indexes.
  * @param {number} [options.expireAfterSeconds=null] Allows you to expire data on indexes applied to a data (MongoDB 2.2 or higher)
  * @param {number} [options.name=null] Override the autogenerated index name (useful if the resulting name is larger than 128 bytes)
+ * @param {object} [options.collation=null] Specify collation (MongoDB 3.4 or higher) settings for update operation (see 3.4 documentation for available fields).
  * @param {Collection~resultCallback} [callback] The command result callback
  * @return {Promise} returns Promise if no callback passed
  */
@@ -1863,6 +1866,7 @@ define.classMethod('listIndexes', {callback: false, promise:false, returns: [Com
  * @param {number} [options.v=null] Specify the format version of the indexes.
  * @param {number} [options.expireAfterSeconds=null] Allows you to expire data on indexes applied to a data (MongoDB 2.2 or higher)
  * @param {number} [options.name=null] Override the autogenerated index name (useful if the resulting name is larger than 128 bytes)
+ * @param {object} [options.collation=null] Specify collation (MongoDB 3.4 or higher) settings for update operation (see 3.4 documentation for available fields).
  * @param {Collection~resultCallback} [callback] The command result callback
  * @return {Promise} returns Promise if no callback passed
  */
@@ -2564,6 +2568,7 @@ function decorateWithCollation(command, self, options) {
  * @param {boolean} [options.promoteLongs=true] Promotes Long values to number if they fit inside the 53 bits resolution.
  * @param {boolean} [options.promoteValues=true] Promotes BSON values to native types where possible, set to false to only receive wrapper types.
  * @param {boolean} [options.promoteBuffers=false] Promotes Binary BSON values to native Node Buffers.
+ * @param {object} [options.collation=null] Specify collation (MongoDB 3.4 or higher) settings for update operation (see 3.4 documentation for available fields).
  * @param {Collection~resultCallback} callback The command result callback
  * @return {(null|AggregationCursor)}
  */
@@ -2614,7 +2619,7 @@ Collection.prototype.aggregate = function(pipeline, options, callback) {
 
   // Decorate command with writeConcern if out has been specified
   if(pipeline.length > 0 && pipeline[pipeline.length - 1]['$out']) {
-    decorateWithWriteConcern(command, self, options);    
+    decorateWithWriteConcern(command, self, options);
   }
 
   // Have we specified collation

lib/cursor.js

@@ -581,7 +581,7 @@ define.classMethod('batchSize', {callback: false, promise:false, returns: [Curso
 /**
  * Set the collation options for the cursor.
  * @method
- * @param {object} value The cursor collation options
+ * @param {object} value The cursor collation options (MongoDB 3.4 or higher) settings for update operation (see 3.4 documentation for available fields).
  * @throws {MongoError}
  * @return {Cursor}
  */

lib/db.js

@@ -551,6 +551,7 @@ var createCollection = function(self, name, options, callback) {
  * @param {number} [options.size=null] The size of the capped collection in bytes.
  * @param {number} [options.max=null] The maximum number of documents in the capped collection.
  * @param {boolean} [options.autoIndexId=true] Create an index on the _id field of the document, True by default on MongoDB 2.2 or higher off for version < 2.2.
+ * @param {object} [options.collation=null] Specify collation (MongoDB 3.4 or higher) settings for update operation (see 3.4 documentation for available fields).
  * @param {Db~collectionResultCallback} [callback] The results callback
  * @return {Promise} returns Promise if no callback passed
  */

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "2.2.9",
+  "version": "2.2.10",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "repository": {
@@ -14,7 +14,7 @@
   ],
   "dependencies": {
     "es6-promise": "3.2.1",
-    "mongodb-core": "christkv/mongodb-core#2.0",
+    "mongodb-core": "2.0.12",
     "readable-stream": "2.1.5"
   },
   "devDependencies": {