natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.0' into cassandra-2.1

This commit is contained in:
Tyler Hobbs 2015-05-12 16:23:32 -05:00
parent 98eb8ba52d 28cfbfa685
commit 75e5b3b55a
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/native_protocol_v1.spec
View File

@ -688,8 +688,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:
@ -714,9 +714,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

10
doc/native_protocol_v2.spec
View File

@ -872,8 +872,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:
@ -898,9 +898,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

10
doc/native_protocol_v3.spec
View File

@ -954,8 +954,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:
@ -980,9 +980,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