From:  <brian@gir-2.local>
Date: Tue, 19 Feb 2008 06:10:47 +0000 (+0530)
Subject: Merge fix.
X-Git-Tag: _20~9
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=89b196897dcf0fcf1b12ef2861f49f26044ff7b4;p=m6w6%2Flibmemcached

Merge fix.
---

89b196897dcf0fcf1b12ef2861f49f26044ff7b4
diff --cc ChangeLog
index 0c835b88,daa339b9..46c15ea9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,4 +1,8 @@@
 +0.17
 +  * MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT added for connect timeout in
 +    non-block mode.
 +
- 0.16
+ 0.16 Mon Feb 18 00:30:25 PST 2008
    * Work on the UDP protocol
    * Added get_by_key, set_by_key tests for C++ API
    * Fix for limit_maxbytes to be 64bit in stats