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

2 files changed, 5 insertions, 1 deletions

diff --git a/jstests/eval1.js b/jstests/eval1.js
index 313cfdc52c3..4a5ca75f09b 100644
--- a/jstests/eval1.js
+++ b/jstests/eval1.js
@@ -15,4 +15,3 @@ assert.eq( "sara" , f( 2 ) , "B" );
 assert.eq( "eliot" , db.eval( f , 1 ) , "C" );
 assert.eq( "sara" , db.eval( f , 2 ) , "D" );
 
-assert.gt( 10 , Date.timeFunc( function(){ db.eval( f , 2 ) } ) , "simple db.eval should be less than 5ms on good connection " );
diff --git a/jstests/group1.js b/jstests/group1.js
index 4c4a8f980ed..292e91902be 100644
--- a/jstests/group1.js
+++ b/jstests/group1.js
@@ -20,6 +20,11 @@ assert( res[0].count == 2 , "C" );
 assert( res[1].a == 2 , "D" );
 assert( res[1].count == 3 , "E" );
 
+// TEMP DEBUGGING
+p.ns = t._shortName;
+printjson( db.runCommand( { "group" : db._groupFixParms( p ) } ) );
+// ----
+
 assert.eq( res , t.groupcmd( p ) , "ZZ" );
 
 ret = t.groupcmd( { key : {} , reduce : p.reduce , initial : p.initial } );