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

voldemort · Jun 23, 2009 · 7d91b0a · 7d91b0a
2 parents 69ee678 + 3fb68dc
commit 7d91b0a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/clients/cpp/include/voldemort/InconsistencyResolver.h b/clients/cpp/include/voldemort/InconsistencyResolver.h
@@ -42,7 +42,7 @@ class InconsistencyResolver
     /**
      * Resolve conflicts in the given list of items and modify the
      * list to contain the resolved set of items.  Note that data in a
-     * @ref VersionedValue is shared via reference couting on
+     * @ref VersionedValue is shared via reference counting on
      * copy/assignment, so copying it is an inexpensive operation.
      * 
      * @param items the list of items to resolve

diff --git a/clients/cpp/src/ConnectionPool.cpp b/clients/cpp/src/ConnectionPool.cpp
@@ -146,7 +146,7 @@ void ConnectionPool::checkin(shared_ptr<Connection>& conn) {
         }
     }
 
-    checkinCond.notify_one();
+    checkinCond.notify_all();
 }
 
 } /* namespace Voldemort */