Merge in Ubuntu fixes.

[m6w6/libmemcached] / libmemcached / options / parser.h

diff --git a/libmemcached/options/parser.h b/libmemcached/options/parser.h
index 09abf9c8150ac0b3eef2fdbd148354bb704206ff..16657d2457f1ca39c8257cbda2d5c44305253eba 100644 (file)
--- a/libmemcached/options/parser.h
+++ b/libmemcached/options/parser.h
@@ -47,63 +47,66 @@
      CONFIGURE_FILE = 264,
      EMPTY_LINE = 265,
      SERVER = 266,
-     SERVERS = 267,
-     SERVERS_OPTION = 268,
-     UNKNOWN_OPTION = 269,
-     UNKNOWN = 270,
-     BINARY_PROTOCOL = 271,
-     BUFFER_REQUESTS = 272,
-     CONNECT_TIMEOUT = 273,
-     DISTRIBUTION = 274,
-     HASH = 275,
-     HASH_WITH_PREFIX_KEY = 276,
-     IO_BYTES_WATERMARK = 277,
-     IO_KEY_PREFETCH = 278,
-     IO_MSG_WATERMARK = 279,
-     KETAMA_HASH = 280,
-     KETAMA_WEIGHTED = 281,
-     NOREPLY = 282,
-     NUMBER_OF_REPLICAS = 283,
-     POLL_TIMEOUT = 284,
-     RANDOMIZE_REPLICA_READ = 285,
-     RCV_TIMEOUT = 286,
-     REMOVE_FAILED_SERVERS = 287,
-     RETRY_TIMEOUT = 288,
-     SND_TIMEOUT = 289,
-     SOCKET_RECV_SIZE = 290,
-     SOCKET_SEND_SIZE = 291,
-     SORT_HOSTS = 292,
-     SUPPORT_CAS = 293,
-     USER_DATA = 294,
-     USE_UDP = 295,
-     VERIFY_KEY = 296,
-     _TCP_KEEPALIVE = 297,
-     _TCP_KEEPIDLE = 298,
-     _TCP_NODELAY = 299,
-     PREFIX_KEY = 300,
-     MD5 = 301,
-     CRC = 302,
-     FNV1_64 = 303,
-     FNV1A_64 = 304,
-     FNV1_32 = 305,
-     FNV1A_32 = 306,
-     HSIEH = 307,
-     MURMUR = 308,
-     JENKINS = 309,
-     CONSISTENT = 310,
-     MODULA = 311,
-     RANDOM = 312,
-     TRUE = 313,
-     FALSE = 314,
-     FLOAT = 315,
-     NUMBER = 316,
-     PORT = 317,
-     WEIGHT_START = 318,
-     IPADDRESS = 319,
-     HOSTNAME = 320,
-     STRING = 321,
-     QUOTED_STRING = 322,
-     FILE_PATH = 323
+     SOCKET = 267,
+     SERVERS = 268,
+     SERVERS_OPTION = 269,
+     UNKNOWN_OPTION = 270,
+     UNKNOWN = 271,
+     BINARY_PROTOCOL = 272,
+     BUFFER_REQUESTS = 273,
+     CONNECT_TIMEOUT = 274,
+     DISTRIBUTION = 275,
+     HASH = 276,
+     HASH_WITH_NAMESPACE = 277,
+     IO_BYTES_WATERMARK = 278,
+     IO_KEY_PREFETCH = 279,
+     IO_MSG_WATERMARK = 280,
+     KETAMA_HASH = 281,
+     KETAMA_WEIGHTED = 282,
+     NOREPLY = 283,
+     NUMBER_OF_REPLICAS = 284,
+     POLL_TIMEOUT = 285,
+     RANDOMIZE_REPLICA_READ = 286,
+     RCV_TIMEOUT = 287,
+     REMOVE_FAILED_SERVERS = 288,
+     RETRY_TIMEOUT = 289,
+     SND_TIMEOUT = 290,
+     SOCKET_RECV_SIZE = 291,
+     SOCKET_SEND_SIZE = 292,
+     SORT_HOSTS = 293,
+     SUPPORT_CAS = 294,
+     USER_DATA = 295,
+     USE_UDP = 296,
+     VERIFY_KEY = 297,
+     _TCP_KEEPALIVE = 298,
+     _TCP_KEEPIDLE = 299,
+     _TCP_NODELAY = 300,
+     NAMESPACE = 301,
+     POOL_MIN = 302,
+     POOL_MAX = 303,
+     MD5 = 304,
+     CRC = 305,
+     FNV1_64 = 306,
+     FNV1A_64 = 307,
+     FNV1_32 = 308,
+     FNV1A_32 = 309,
+     HSIEH = 310,
+     MURMUR = 311,
+     JENKINS = 312,
+     CONSISTENT = 313,
+     MODULA = 314,
+     RANDOM = 315,
+     TRUE = 316,
+     FALSE = 317,
+     FLOAT = 318,
+     NUMBER = 319,
+     PORT = 320,
+     WEIGHT_START = 321,
+     IPADDRESS = 322,
+     HOSTNAME = 323,
+     STRING = 324,
+     QUOTED_STRING = 325,
+     FILE_PATH = 326
    };
 #endif