cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Mon, 21 Dec 2015 15:33:14 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/adc9a241
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/adc9a241
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/adc9a241

Branch: refs/heads/trunk
Commit: adc9a241e396e91ce7d6843aca27eedf6f87944d
Parents: 67fd42f 8565ca8
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon Dec 21 16:32:52 2015 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon Dec 21 16:32:52 2015 +0100

----------------------------------------------------------------------
 doc/native_protocol_v4.spec | 311 +++++++++++++++++++--------------------
 1 file changed, 155 insertions(+), 156 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/adc9a241/doc/native_protocol_v4.spec
----------------------------------------------------------------------
diff --cc doc/native_protocol_v4.spec
index 7f54970,51cb875..7fcf1d8
--- a/doc/native_protocol_v4.spec
+++ b/doc/native_protocol_v4.spec
@@@ -1004,15 -997,15 +997,15 @@@ Table of Content
      to performance to pick a value too low. A value below 100 is probably too
      low for most use cases.
    - Clients should not rely on the actual size of the result set returned to
-     decide if there is more result to fetch or not. Instead, they should always
-     check the Has_more_pages flag (unless they did not enabled paging for the query
+     decide if there are more results to fetch or not. Instead, they should always
+     check the Has_more_pages flag (unless they did not enable paging for the query
      obviously). Clients should also not assert that no result will have more than
-     <result_page_size> results. While the current implementation always respect
-     the exact value of <result_page_size>, we reserve ourselves the right to return
+     <result_page_size> results. While the current implementation always respects
+     the exact value of <result_page_size>, we reserve the right to return
      slightly smaller or bigger pages in the future for performance reasons.
    - The <paging_state> is specific to a protocol version and drivers should not
 -    send a <paging_state> returned by a node using protocol v3 to query a node
 -    using protocol v4 for instance.
 +    send a <paging_state> returned by a node using the protocol v3 to query a node
 +    using the protocol v4 for instance.
  
  
  9. Error codes


Mime
View raw message