Conflicts: s/server.cpp Signed-off-by: Eric Milkie <email@example.com>
Was already ignoring on mongod, this just duplicated that behavior for mongos. Conflicts: s/server.cpp
Backport of commit f86f60a
…filemd5. SERVER-6742 This ensures that there are no pending writebacks from the chunks being inserted.
Backport of git commit: bf724ef
and call ElapsedTracker::resetLastTime when we're done sleeping Conflicts: db/clientcursor.cpp
Solaris was crashing because we were using signal() instead of sigaction() to install the dummy signal handler for SIGPIPE. SIGPIPE is supressed via the socket library on other operating systems but this is not an option on Solaris. Conflicts: db/db.cpp
… MongoFiles Conflicts: db/dur.cpp