Permalink
Browse files

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

  • Loading branch information...
2 parents 69ee678 + 3fb68dc commit 7d91b0a1a3dc24096dbfe1526f8a15d1e5a2bbe5 @jkreps jkreps committed Jun 23, 2009
Showing with 2 additions and 2 deletions.
  1. +1 −1 clients/cpp/include/voldemort/InconsistencyResolver.h
  2. +1 −1 clients/cpp/src/ConnectionPool.cpp
@@ -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
@@ -146,7 +146,7 @@ void ConnectionPool::checkin(shared_ptr<Connection>& conn) {
}
}
- checkinCond.notify_one();
+ checkinCond.notify_all();
}
} /* namespace Voldemort */

0 comments on commit 7d91b0a

Please sign in to comment.