Merge lp:~trond-norbye/libmemcached/bug_400182 into lp:~tangent-org/libmemcached/trunk

Proposed by Trond Norbye
Status: Merged
Merged at revision: not available
Proposed branch: lp:~trond-norbye/libmemcached/bug_400182
Merge into: lp:~tangent-org/libmemcached/trunk
Diff against target: None lines
To merge this branch: bzr merge lp:~trond-norbye/libmemcached/bug_400182
Reviewer Review Type Date Requested Status
Libmemcached-developers Pending
Review via email: mp+8876@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Trond Norbye (trond-norbye) wrote :

Ignore the new conn_yields stat. We should really come up with the new stats API!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libmemcached/memcached_stats.c'
2--- libmemcached/memcached_stats.c 2009-07-08 13:38:34 +0000
3+++ libmemcached/memcached_stats.c 2009-07-16 12:11:04 +0000
4@@ -148,7 +148,8 @@
5 strcmp("cas_badval", key) == 0 ||
6 strcmp("cmd_flush", key) == 0 ||
7 strcmp("accepting_conns", key) == 0 ||
8- strcmp("listen_disabled_num", key) == 0))
9+ strcmp("listen_disabled_num", key) == 0 ||
10+ strcmp("conn_yields", key) == 0))
11 {
12 WATCHPOINT_STRING(key);
13 return MEMCACHED_UNKNOWN_STAT_KEY;

Subscribers

People subscribed via source and target branches

to all changes: