cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Thu, 18 Jun 2015 08:25:45 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/4938ab5b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4938ab5b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4938ab5b

Branch: refs/heads/trunk
Commit: 4938ab5bf3224aeff7dbbbed9851db8dabaff014
Parents: 43d21c3 94be12c
Author: Robert Stupp <snazy@snazy.de>
Authored: Thu Jun 18 10:24:54 2015 +0200
Committer: Robert Stupp <snazy@snazy.de>
Committed: Thu Jun 18 10:24:54 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                            |  1 +
 src/java/org/apache/cassandra/config/Schema.java       |  8 ++++----
 .../org/apache/cassandra/cql3/functions/Functions.java | 13 ++-----------
 .../cql3/statements/CreateFunctionStatement.java       |  4 +++-
 .../apache/cassandra/schema/LegacySchemaTables.java    |  4 ++--
 .../org/apache/cassandra/cql3/AggregationTest.java     |  4 ++--
 test/unit/org/apache/cassandra/cql3/UFTest.java        |  4 ++--
 7 files changed, 16 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4938ab5b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6c1f82d,3671af9..16d9722
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 +3.0:
 + * 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
+  * Duplicate compilation of UDFs on coordinator (CASSANDRA-9475)
   * Fix connection leak in CqlRecordWriter (CASSANDRA-9576)
   * Mlockall before opening system sstables & remove boot_without_jna option (CASSANDRA-9573)
   * Add functions to convert timeuuid to date or time, deprecate dateOf and unixTimestampOf
(CASSANDRA-9229)


Mime
View raw message