Repository: cassandra Updated Branches: refs/heads/trunk e0d25874c -> 68b2d2858
Add missing type for <blockfor> in protocol specs Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/28cfbfa6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/28cfbfa6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/28cfbfa6 Branch: refs/heads/trunk Commit: 28cfbfa685b5cd08967a1bff824438e4d0032aa6 Parents: 33cf701 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Tue May 12 16:21:58 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Tue May 12 16:21:58 2015 -0500 ---------------------------------------------------------------------- doc/native_protocol_v1.spec | 10 +++++----- doc/native_protocol_v2.spec | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/28cfbfa6/doc/native_protocol_v1.spec ---------------------------------------------------------------------- diff --git a/doc/native_protocol_v1.spec b/doc/native_protocol_v1.spec index 41146f9..0329765 100644 --- a/doc/native_protocol_v1.spec +++ b/doc/native_protocol_v1.spec @@ -683,8 +683,8 @@ Table of Contents the exception. <received> is an [int] representing the number of nodes having acknowledged the request. - <blockfor> is the number of replica whose acknowledgement is - required to achieve <cl>. + <blockfor> is an [int] representing the number of replica whose + acknowledgement is required to achieve <cl>. <writeType> is a [string] that describe the type of the write that timeouted. The value of that string can be one of: @@ -709,9 +709,9 @@ Table of Contents the exception. <received> is an [int] representing the number of nodes having answered the request. - <blockfor> is the number of replica whose response is - required to achieve <cl>. Please note that it is - possible to have <received> >= <blockfor> if + <blockfor> is an [int] representing the number of replicas whose + response is required to achieve <cl>. Please note that it + is possible to have <received> >= <blockfor> if <data_present> is false. And also in the (unlikely) case were <cl> is achieved but the coordinator node timeout while waiting for read-repair http://git-wip-us.apache.org/repos/asf/cassandra/blob/28cfbfa6/doc/native_protocol_v2.spec ---------------------------------------------------------------------- diff --git a/doc/native_protocol_v2.spec b/doc/native_protocol_v2.spec index 584ae2f..4493966 100644 --- a/doc/native_protocol_v2.spec +++ b/doc/native_protocol_v2.spec @@ -867,8 +867,8 @@ Table of Contents the exception. <received> is an [int] representing the number of nodes having acknowledged the request. - <blockfor> is the number of replica whose acknowledgement is - required to achieve <cl>. + <blockfor> is an [int] representing the number of replica whose + acknowledgement is required to achieve <cl>. <writeType> is a [string] that describe the type of the write that timeouted. The value of that string can be one of: @@ -893,9 +893,9 @@ Table of Contents the exception. <received> is an [int] representing the number of nodes having answered the request. - <blockfor> is the number of replica whose response is - required to achieve <cl>. Please note that it is - possible to have <received> >= <blockfor> if + <blockfor> is an [int] representing the number of replica whose + response is required to achieve <cl>. Please note that it + is possible to have <received> >= <blockfor> if <data_present> is false. And also in the (unlikely) case were <cl> is achieved but the coordinator node timeout while waiting for read-repair