cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Tue, 23 Jun 2015 17:21:55 GMT
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 15b1f9bc46badee64951edf48b49b9f8bd88198a
Parents: ddf6c0b cfab9da
Author: Robert Stupp <snazy@snazy.de>
Authored: Tue Jun 23 19:20:30 2015 +0200
Committer: Robert Stupp <snazy@snazy.de>
Committed: Tue Jun 23 19:20:30 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 bin/cqlsh                                       | 116 ++++++++++++++++-
 lib/cassandra-driver-2.6.0c1.zip                | Bin 0 -> 198898 bytes
 ...driver-internal-only-2.5.1.post0-074650b.zip | Bin 195907 -> 0 bytes
 pylib/cqlshlib/cql3handling.py                  |  93 ++++++++++++--
 pylib/cqlshlib/helptopics.py                    | 125 +++++++++++++++++++
 src/java/org/apache/cassandra/cql3/Cql.g        |   2 +
 7 files changed, 326 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/15b1f9bc/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 08528f8,c0480d7..e47c4bb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,5 +1,17 @@@
 +3.0:
 + * Add algorithmic token allocation (CASSANDRA-7032)
 + * Add nodetool command to replay batchlog (CASSANDRA-9547)
 + * Make file buffer cache independent of paths being read (CASSANDRA-8897)
 + * Remove deprecated legacy Hadoop code (CASSANDRA-9353)
 + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
 + * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
 + * Change default garbage collector to G1 (CASSANDRA-7486)
 + * Populate TokenMetadata early during startup (CASSANDRA-9317)
 + * undeprecate cache recentHitRate (CASSANDRA-6591)
 +
 +
  2.2
+  * Update cqlsh for UDFs (CASSANDRA-7556)
   * Change Windows kernel default timer resolution (CASSANDRA-9634)
   * Deprected sstable2json and json2sstable (CASSANDRA-9618)
   * Allow native functions in user-defined aggregates (CASSANDRA-9542)


Mime
View raw message