lampayan 98e2b57ed4 Merge remote-tracking branch 'origin/other_dev' into lampayan ... # Conflicts: # etcd/Client.hpp # proto/kv.proto # src/Client.cpp		2016-06-07 15:41:12 +02:00
..
Client.hpp	Merge remote-tracking branch 'origin/other_dev' into lampayan	2016-06-07 15:41:12 +02:00
DeleteRpcResponse.h	preparation for merge	2016-06-07 15:37:09 +02:00
Response.hpp	preparation for merge	2016-06-07 15:37:09 +02:00
Value.hpp	Crude DeleteV3, version 2 backward compatibility, implementation	2016-06-07 14:46:40 +02:00