diff options
| author | unknown <Administrator@.(none)> | 2008-10-19 17:48:11 -0500 |
|---|---|---|
| committer | unknown <Administrator@.(none)> | 2008-10-19 17:48:11 -0500 |
| commit | e7ca864e925d3d4d2c40997294d48d15b23506ac (patch) | |
| tree | c1e5593dd65cd33f382816b5e9cd406823afb93a | |
| parent | f91cff53a095d9b92cfde329350afc7f3d31841c (diff) | |
| parent | 6ed8c54cde486a4fe780de489308683f35ea9c7e (diff) | |
| download | mongo-e7ca864e925d3d4d2c40997294d48d15b23506ac.tar.gz | |
Merge branch 'master' of ssh://git.10gen.com/data/gitroot/p
Conflicts:
grid/message.cpp
| -rw-r--r-- | grid/message.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/grid/message.cpp b/grid/message.cpp index 0d22705bcb2..5733a4d8fb0 100644 --- a/grid/message.cpp +++ b/grid/message.cpp @@ -167,7 +167,7 @@ again: md->len = len; if ( len <= 0 ){ - log() << "got a length of 0, something is wrong" << endl; + cout << "got a length of " << len << ", something is wrong" << endl; return false; } |