diff options
| author | Eliot Horowitz <eliot@10gen.com> | 2010-09-03 12:01:09 -0400 |
|---|---|---|
| committer | Eliot Horowitz <eliot@10gen.com> | 2010-09-03 12:01:09 -0400 |
| commit | 2e4b7c409593e4884981f617b04665d9a7cb1dac (patch) | |
| tree | a45316aa221a74de001db977f281af4695ef82b8 | |
| parent | 1c0d685f9a22c8e4acba957dba99feda69bc12be (diff) | |
| parent | c58ddb10d4cd63e3fe21ee439b1595459ab1e3b9 (diff) | |
| download | mongo-2e4b7c409593e4884981f617b04665d9a7cb1dac.tar.gz | |
Merge branch 'master' of github.com:mongodb/mongo
Conflicts:
s/strategy_shard.cpp
| -rw-r--r-- | s/strategy_shard.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/s/strategy_shard.cpp b/s/strategy_shard.cpp index e7608b2ae55..dce09fd13ca 100644 --- a/s/strategy_shard.cpp +++ b/s/strategy_shard.cpp @@ -192,8 +192,6 @@ namespace mongo { BSONObj key = manager->getShardKey().extractKey(query); BSONForEach(e, key){ - //PRINT(e); - //PRINT(getGtLtOp(e)); uassert(13465, "shard key in upsert query must be an exact match", getGtLtOp(e) == BSONObj::Equality); } } |