Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/33f1edcc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33f1edcc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33f1edcc Branch: refs/heads/trunk Commit: 33f1edcce97779c971d4f78712a9a8bf014ffbbc Parents: ad007f0 6e92962 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Oct 30 09:49:33 2015 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Oct 30 09:49:33 2015 +0100 ---------------------------------------------------------------------- doc/native_protocol_v3.spec | 11 ++++++++--- doc/native_protocol_v4.spec | 6 +++++- 2 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/33f1edcc/doc/native_protocol_v3.spec ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/33f1edcc/doc/native_protocol_v4.spec ----------------------------------------------------------------------
