From 55e0ec6389a0d13dde237552cfef6b83b4728e3f Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@gaz>
Date: Wed, 28 Jul 2010 16:29:57 -0700
Subject: [PATCH] Fix everything for release.

---
 ChangeLog                    |  3 ++-
 docs/Makefile.am             |  5 ++++-
 docs/memcached_stats.pod     | 12 ++++++++++++
 docs/memstat.pod             |  4 +++-
 support/libmemcached.spec.in |  1 +
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c45a91d3..913e9a0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
-0.43
+0.43 Wed Jul 28 16:29:47 PDT 2010
+  * Added --args to memstat so that a greater range of values can be returned.
   * Prelimanary support for Windows.
   * memcached_stat_execute() merged. 
 
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 398124e5..e97ff32a 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -138,7 +138,8 @@ BUILT_SOURCES += ${SET_PAGES}
 
 STATS_PAGES= \
 	     memcached_stat.pop \
-	     memcached_stat_get_keys.pop .pop\
+	     memcached_stat_execute.pop\
+	     memcached_stat_get_keys.pop\
 	     memcached_stat_get_value.pop \
 	     memcached_stat_servername.pop
 BUILT_SOURCES += ${STATS_PAGES}
@@ -271,6 +272,7 @@ HTML_FILES= \
 	    memcached_set_memory_allocators.html \
 	    memcached_set.html \
 	    memcached_set_user_data.html \
+	    memcached_stat_execute.html \
 	    memcached_stat_get_keys.html \
 	    memcached_stat_get_value.html \
 	    memcached_stat.html \
@@ -402,6 +404,7 @@ man_MANS = \
 	   memcached_set_memory_allocators.3 \
 	   memcached_set_user_data.3 \
 	   memcached_stat.3 \
+	   memcached_stat_execute.3 \
 	   memcached_stat_get_keys.3 \
 	   memcached_stat_get_value.3 \
 	   memcached_stat_servername.3 \
diff --git a/docs/memcached_stats.pod b/docs/memcached_stats.pod
index fe093d10..3b198d99 100644
--- a/docs/memcached_stats.pod
+++ b/docs/memcached_stats.pod
@@ -30,6 +30,12 @@ C Client Library for memcached (libmemcached, -lmemcached)
                              memcached_stat_st *stat, 
                              memcached_return_t *error);
 
+  memcached_return_t
+    memcached_stat_execute (memcached_st *memc,
+                            const char *args,
+                            memcached_stat_fn func,
+                            void *context);
+
 =head1 DESCRIPTION
 
 libmemcached(3) has the ability to query a memcached server (or collection
@@ -38,6 +44,12 @@ C<memcached_stat_st> structure. You are responsible for freeing this structure.
 While it is possible to access the structure directly it is not advisable.
 <memcached_stat_get_value() has been provided to query the structure.
 
+memcached_stat_execute() uses the servers found in C<memcached_stat_st> and 
+executes a "stat" command on each server. args is an optional argument that 
+can be passed in to modify the behavior of "stats". You will need to supply
+a callback function that will be supplied each pair of values returned by
+the memcached server.
+
 memcached_stat() fetches an array of C<memcached_stat_st> structures containing
 the state of all available memcached servers. The return value must be freed
 by the calling application. If called with the C<MEMCACHED_BEHAVIOR_USE_UDP>
diff --git a/docs/memstat.pod b/docs/memstat.pod
index 9341e7c8..a1079cc0 100644
--- a/docs/memstat.pod
+++ b/docs/memstat.pod
@@ -12,7 +12,9 @@ B<memstat> dumps the state of memcached(1) servers.
 It displays all data to stdout.
 
 You can specify servers via the B<--servers> option or via the
-environment variable C<MEMCACHED_SERVERS>.
+environment variable C<MEMCACHED_SERVERS>. B<--args> can be used
+to specify the "argument" sent to the stats command (ie slab, size, items,
+etc..).
 
 For a full list of operations run the tool with the B<--help> option.
 
diff --git a/support/libmemcached.spec.in b/support/libmemcached.spec.in
index 859fd961..6b022b43 100644
--- a/support/libmemcached.spec.in
+++ b/support/libmemcached.spec.in
@@ -242,6 +242,7 @@ you will need to install %{name}-devel.
 %{_mandir}/man3/memcached_set_sasl_callbacks.3.gz
 %{_mandir}/man3/memcached_set_user_data.3.gz
 %{_mandir}/man3/memcached_stat.3.gz
+%{_mandir}/man3/memcached_stat_execute.3.gz
 %{_mandir}/man3/memcached_stat_get_keys.3.gz
 %{_mandir}/man3/memcached_stat_get_value.3.gz
 %{_mandir}/man3/memcached_stat_servername.3.gz
-- 
2.30.2