Merge in fixes

[m6w6/libmemcached] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 9c0bea9ccff6f3769ce1fad28d73f381faa11560..feff011208a3ddf83948d4df452b79fd3213aeca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
   * Fix calls to auto methods so that if value is not passed in nothing bad happens.
   * New parser calls for generating memcached_st objects.
   * New error system.
+  * Added new documentation system.
+  * A behavior change has been now made that if you specify a weight for any
+  server, we enable the weight flag and do weight balancing.
 
 0.48 Tue Mar 15 23:05:18 PDT 2011
   * Fix memory leak in server parse.