Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb33f383 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb33f383 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb33f383 Branch: refs/heads/trunk Commit: fb33f383aa62c5f85ae2b663d91b5d9bfd5a5056 Parents: 551b68e 33f1edc Author: Sylvain Lebresne <[email protected]> Authored: Fri Oct 30 09:49:50 2015 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Oct 30 09:49:50 2015 +0100 ---------------------------------------------------------------------- doc/native_protocol_v3.spec | 11 ++++++++--- doc/native_protocol_v4.spec | 6 +++++- 2 files changed, 13 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
