Merge branch 'cassandra-2.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/216139ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/216139ff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/216139ff Branch: refs/heads/trunk Commit: 216139ff69dbd83907b3cd20d9c0f223135d10f5 Parents: 6e6730d 09c7dee Author: Jason Brown <jasedbr...@gmail.com> Authored: Tue Dec 17 11:06:01 2013 -0800 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Tue Dec 17 11:06:01 2013 -0800 ---------------------------------------------------------------------- doc/native_protocol_v1.spec | 2 +- doc/native_protocol_v2.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
