projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge from private trunk.
[awesomized/libmemcached]
/
libmemcached
/
constants.h
diff --git
a/libmemcached/constants.h
b/libmemcached/constants.h
index ec7c66a241dac0c395e169822ba9ee360590670c..516e50ee08f5cc05eb6c015e06ab94ea90c989e3 100644
(file)
--- a/
libmemcached/constants.h
+++ b/
libmemcached/constants.h
@@
-76,6
+76,7
@@
enum memcached_return_t {
MEMCACHED_AUTH_CONTINUE,
MEMCACHED_PARSE_ERROR,
MEMCACHED_PARSE_USER_ERROR,
MEMCACHED_AUTH_CONTINUE,
MEMCACHED_PARSE_ERROR,
MEMCACHED_PARSE_USER_ERROR,
+ MEMCACHED_DEPRECATED,
MEMCACHED_MAXIMUM_RETURN /* Always add new error code before */
};
MEMCACHED_MAXIMUM_RETURN /* Always add new error code before */
};
@@
-91,6
+92,7
@@
enum memcached_server_distribution_t {
MEMCACHED_DISTRIBUTION_RANDOM,
MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY,
MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED,
MEMCACHED_DISTRIBUTION_RANDOM,
MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY,
MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED,
+ MEMCACHED_DISTRIBUTION_VIRTUAL_BUCKET,
MEMCACHED_DISTRIBUTION_CONSISTENT_MAX
};
MEMCACHED_DISTRIBUTION_CONSISTENT_MAX
};