Merge branch 'master' of github.com:mongodb/mongo

Conflicts: scripting/engine_spidermonkey.cpp
2010-05-26 01:08:36 -04:00
parent 39f1354781 4a91c2c8b2
commit e1188a3c61
54 changed files with 293 additions and 190 deletions
--- a/scripting/engine_spidermonkey.cpp
+++ b/scripting/engine_spidermonkey.cpp
@@ -669,7 +669,7 @@ namespace mongo {
            }
            }

-            log() << "toval: unknown type: " << (int)(e.type()) << endl;
+            log() << "toval: unknown type: " << (int) e.type() << endl;
            uassert( 10218 ,  "not done: toval" , 0 );
            return 0;
        }