Permalink
Browse files

Merge branch '3.8.x' of github.com:LearnBoost/mongoose into 3.8.x

  • Loading branch information...
2 parents 6549455 + 7d976b5 commit 6ce2e1452253123c5b4f49a89681fa6733df3d58 @aheckmann aheckmann committed Feb 22, 2014
Showing with 8 additions and 1 deletion.
  1. +7 −0 lib/index.js
  2. +1 −1 lib/model.js
View
@@ -8,6 +8,7 @@ var Schema = require('./schema')
, SchemaType = require('./schematype')
, VirtualType = require('./virtualtype')
, SchemaDefaults = require('./schemadefault')
+ , STATES = require('./connectionstate')
, Types = require('./types')
, Query = require('./query')
, Promise = require('./promise')
@@ -63,6 +64,12 @@ function Mongoose () {
};
/**
+ * Expose connection states for user-land
+ *
+ */
+Mongoose.prototype.STATES = STATES;
+
+/**
* Sets mongoose options
*
* ####Example:
View
@@ -1592,7 +1592,7 @@ Model.create = function create (doc, fn) {
* doc.save(callback);
* })
*
- * @see strict schemas http://mongoosejs.com/docs/guide.html#strict
+ * @see strict http://mongoosejs.com/docs/guide.html#strict
* @param {Object} conditions
* @param {Object} update
* @param {Object} [options]

0 comments on commit 6ce2e14

Please sign in to comment.