From:  <brian@localhost.localdomain>
Date: Fri, 2 May 2008 13:15:17 +0000 (-0700)
Subject: Merge
X-Git-Tag: _20~1^2~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=aadde7bff9b295789dbf4a1eeb9b37825a970c02;p=m6w6%2Flibmemcached

Merge
---

aadde7bff9b295789dbf4a1eeb9b37825a970c02
diff --cc ChangeLog
index 5750968b,eae69e8b..6ab35316
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,4 +1,6 @@@
 +  * New consistent distribution tests.
 +  * Found a memory leak when a server constantly fails.
+   * Fix in watchpoint macro
    * Changed default timeout to 1 second for poll timeouts
    * Wheel uses less memory/dynamic allocation for size (no longer limited to
      512 hosts by default.