lyr90329 05a95ad014 Merge branch 'Memcached_Client' ... Conflicts: MemcachedClient/src/client.xml MemcachedClient/src/common/MessageManager.java MemcachedClient/src/log4j.properties MemcachedClient/src/messageBody/memcachedmsg.java MemcachedClient/src/messageBody/requestMsg.java MemcachedClient/src/r_memcached/Client.java MemcachedClient/src/r_memcached/MClientPipelineFactory.java MemcachedClient/src/server/ClientConfig.java MemcachedClient/src/server/LockKey.java MemcachedClient/src/server/MDecoder.java MemcachedClient/src/server/MEncoder.java MemcachedClient/src/server/MServerHandler.java MemcachedClient/src/server/MServerPipelineFactory.java MemcachedClient/src/server/NetMsg.java MemcachedClient/src/server/Server.java R-Memcached/protobuf/memcached.proto R-Memcached/protobuf/requestMsg.proto R-Memcached/src/client.xml R-Memcached/src/client/Client.java R-Memcached/src/client/ClientMgr.java R-Memcached/src/client/MClientHandler.java R-Memcached/src/client/MClientPipelineFactory.java R-Memcached/src/common/EMSGID.java R-Memcached/src/common/MessageManager.java R-Memcached/src/common/RegisterHandler.java R-Memcached/src/config.properties R-Memcached/src/log4j.properties R-Memcached/src/memcached/ByteBufArrayInputStream.java R-Memcached/src/memcached/ContextObjectInputStream.java R-Memcached/src/memcached/ErrorHandler.java R-Memcached/src/memcached/LineInputStream.java R-Memcached/src/memcached/MemcachedClient.java R-Memcached/src/memcached/NativeHandler.java R-Memcached/src/memcached/NestedIOException.java R-Memcached/src/memcached/SockIO.java R-Memcached/src/messageBody/memcachedmsg.java R-Memcached/src/messageBody/requestMsg.java R-Memcached/src/server/ClientConfig.java R-Memcached/src/server/LockKey.java R-Memcached/src/server/MDecoder.java R-Memcached/src/server/MEncoder.java R-Memcached/src/server/MServerHandler.java R-Memcached/src/server/MServerPipelineFactory.java R-Memcached/src/server/MemcachedMain.java R-Memcached/src/server/NetMsg.java R-Memcached/src/server/Server.java R-Memcached/src/server/memSession.java R-Memcached/src/test/MainTest.java src/client.xml src/client/Client.java src/client/MClientPipelineFactory.java src/common/MessageManager.java src/log4j.properties src/messageBody/memcachedmsg.java src/messageBody/requestMsg.java src/server/ClientConfig.java src/server/LockKey.java src/server/MDecoder.java src/server/MEncoder.java src/server/MServerHandler.java src/server/MServerPipelineFactory.java src/server/NetMsg.java src/server/Server.java		2014-08-13 16:59:54 +08:00
MemcachedClient/src	Test Memcached client to R-Memcached	2014-08-13 16:51:10 +08:00
R-Memcached	change dir	2014-08-05 16:02:50 +08:00