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/feacf603 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/feacf603 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/feacf603 Branch: refs/heads/trunk Commit: feacf603799934fd40c7cc4670011843ebce5980 Parents: bcd6a6b 0fc15e5 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Aug 13 14:54:12 2013 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Aug 13 14:54:12 2013 -0500 ---------------------------------------------------------------------- doc/native_protocol_v2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ----------------------------------------------------------------------