cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [16/17] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Thu, 17 Sep 2015 20:06:53 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
	test/unit/org/apache/cassandra/cql3/validation/operations/BatchTest.java


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

Branch: refs/heads/cassandra-3.0
Commit: 41a4a538be25348434fe29a12c130ba8acd0cb5c
Parents: caadcf6 6dcc89f
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Thu Sep 17 15:06:18 2015 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Thu Sep 17 15:06:18 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 NEWS.txt                                        |  6 ++++++
 src/java/org/apache/cassandra/gms/Gossiper.java | 11 ++++++++---
 3 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/41a4a538/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/41a4a538/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index b6730a1,49744cf..61989f4
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -117,12 -28,16 +117,18 @@@ Changed Default
     - commitlog_total_space_in_mb will use the smaller of 8192, and 1/4
       of the total space of the commitlog volume. (Before: always used
       8192)
 -   - Incremental repair is on by default since 2.2.0, run full repairs by
 -     providing the '-full' parameter to nodetool repair.
 -   - Parallel repairs are the default since 2.2.0, run sequential repairs
 -     by providing the '-seq' parameter to nodetool repair.
 +
 +New features
 +------------
 +   - Custom QueryHandlers can retrieve the column specifications for the bound
 +     variables from QueryOptions by using the hasColumnSpecifications()
 +     and getColumnSpecifications() methods.
+ 
+ New features
+ ------------
+    - Custom QueryHandlers can retrieve the column specifications for the bound
+      variables from QueryOptions by using the hasColumnSpecifications()
+      and getColumnSpecifications() methods.
  
  
  2.2.1

http://git-wip-us.apache.org/repos/asf/cassandra/blob/41a4a538/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------


Mime
View raw message