Merge

diff --git a/ChangeLog b/ChangeLog
index 2de07f39d17f8e66d2a6f720a298688e07c9d3c4..81ab5c1de5e4d40fd208011d0573e79a9dde1979 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
+0.13
   * Patch from Marc Rossi to add --hash option for memcp, memrm, and memcat.
+  * Kevin's patch for fixing EOF issues during a read.
   * Toru Maesaka patch for stats mismatch
   * Fix for when CRC return 0
   * Fixed uint16_t issues around flags. Turns out the documentation on the

diff --git a/docs/memcached_get.pod b/docs/memcached_get.pod
index f2f2033c33f0e9018af348c89c49d07ea08c6611..f87d47ba03cfb08bdc5862343072f2ef80428e39 100755 (executable)
--- a/docs/memcached_get.pod
+++ b/docs/memcached_get.pod
@@ -92,7 +92,9 @@ result sets to the list of functions you provide. It passes to the function
 a memcached_st that can be cloned for use in called the cluster (it can not 
 be used directly). It also passed a result set which does not need to be freed.
 Finally it passes a "context". This is just a pointer to a memory reference
-you supply the calling function. 
+you supply the calling function. Currently only one value is being passed
+to each function call. In the future there will be an option to allow this
+to be an array.
 
 memcached_get_by_key() and memcached_mget_by_key() behave in a similar nature
 as memcached_get() and memcached_mget(). The difference is that they take