diff options
| author | Dwight <dwight@10gen.com> | 2012-11-07 07:57:48 -0500 |
|---|---|---|
| committer | Dwight <dwight@10gen.com> | 2012-11-07 07:57:48 -0500 |
| commit | 15a65451256ae84e7b5062ce995c2956e8c6f37b (patch) | |
| tree | 19839c01687c074a35b3ecf9c4704ce1a989dbc0 /src/mongo/client/dbclientinterface.h | |
| parent | dda91182284a6940a15da79851d29655a1c9dee2 (diff) | |
| parent | b0b7a8410d15ff394c321a70932843f51969a8ef (diff) | |
| download | mongo-15a65451256ae84e7b5062ce995c2956e8c6f37b.tar.gz | |
Merge branch 'master' of github.com:mongodb/mongo
Conflicts:
src/mongo/bson/bsondemo/bsondemo.cpp
Diffstat (limited to 'src/mongo/client/dbclientinterface.h')
| -rw-r--r-- | src/mongo/client/dbclientinterface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/client/dbclientinterface.h b/src/mongo/client/dbclientinterface.h index 8e01436df64..4b5cdb247c0 100644 --- a/src/mongo/client/dbclientinterface.h +++ b/src/mongo/client/dbclientinterface.h @@ -56,7 +56,7 @@ namespace mongo { // an extended period of time. QueryOption_OplogReplay = 1 << 3, - /** The server normally times out idle cursors after an inactivy period to prevent excess memory uses + /** The server normally times out idle cursors after an inactivity period to prevent excess memory uses Set this option to prevent that. */ QueryOption_NoCursorTimeout = 1 << 4, |