Merge in update for document on prefix key.

diff --git a/ChangeLog b/ChangeLog
index 27535235e723803e865fbd068d5476e4a529041f..3f369c88de086707ce007f98729ae178bc350a74 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+0.48
+  * Fix memory leak in server parse.
+  * Move test framework out to be its own library (easier to work with Gearman).
+
+
 0.47 Wed Feb 23 18:46:48 PST 2011
   * Additional fixes for OpenBSD.
   * Bug fix 677609, 456080.

diff --git a/docs/memcached_callback.pod b/docs/memcached_callback.pod
index 9175c29d2dc841b67b77a0fe53bbb151a91b6978..a5b5429bf1fc36169d5048f69e5c06458c8f8f0a 100644 (file)
--- a/docs/memcached_callback.pod
+++ b/docs/memcached_callback.pod
@@ -56,6 +56,8 @@ the value of your key. The prefix key is only applied to the primary key,
 not the master key. MEMCACHED_FAILURE will be returned if no key is set. In the case
 of a key which is too long MEMCACHED_BAD_KEY_PROVIDED will be returned.
 
+If you set a value with the value being NULL then the prefix key is disabled.
+
 =item MEMCACHED_CALLBACK_USER_DATA
 
 This allows you to store a pointer to a specifc piece of data. This can be