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 Thu, 04 Jun 2015 14:02:10 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/5c4a5b3b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c4a5b3b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c4a5b3b

Branch: refs/heads/trunk
Commit: 5c4a5b3b29e24bb0f4335bdb89d5c134ba88f921
Parents: 9718e13 4df4f79
Author: Robert Stupp <snazy@snazy.de>
Authored: Thu Jun 4 16:01:36 2015 +0200
Committer: Robert Stupp <snazy@snazy.de>
Committed: Thu Jun 4 16:01:36 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../cassandra/cql3/functions/UDFunction.java    |  21 ++-
 .../cassandra/cql3/functions/UDHelper.java      |   7 +
 .../statements/CreateAggregateStatement.java    |   2 +
 .../cassandra/db/marshal/AbstractType.java      |   8 +
 .../cassandra/db/marshal/BooleanType.java       |   5 +
 .../cassandra/db/marshal/CounterColumnType.java |   5 +
 .../apache/cassandra/db/marshal/DateType.java   |   5 +
 .../cassandra/db/marshal/DecimalType.java       |   5 +
 .../apache/cassandra/db/marshal/DoubleType.java |   5 +
 .../apache/cassandra/db/marshal/FloatType.java  |   5 +
 .../cassandra/db/marshal/InetAddressType.java   |   5 +
 .../apache/cassandra/db/marshal/Int32Type.java  |   5 +
 .../cassandra/db/marshal/IntegerType.java       |   5 +
 .../cassandra/db/marshal/LexicalUUIDType.java   |   5 +
 .../apache/cassandra/db/marshal/LongType.java   |   5 +
 .../cassandra/db/marshal/ReversedType.java      |   5 +
 .../cassandra/db/marshal/TimeUUIDType.java      |   5 +
 .../cassandra/db/marshal/TimestampType.java     |   5 +
 .../apache/cassandra/db/marshal/UUIDType.java   |   5 +
 .../apache/cassandra/cql3/AggregationTest.java  |  69 +++++++++
 .../org/apache/cassandra/cql3/UDHelperTest.java | 146 +++++++++++++++++++
 test/unit/org/apache/cassandra/cql3/UFTest.java | 120 ++++++++++++++-
 23 files changed, 439 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c4a5b3b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ea619e6,2ed9ce9..c6e8651
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.0:
 + * 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)
 +
 +
  2.2
+  * Empty INITCOND treated as null in aggregate (CASSANDRA-9457)
   * Remove use of Cell in Thrift MapReduce classes (CASSANDRA-8609)
   * Integrate pre-release Java Driver 2.2-rc1, custom build (CASSANDRA-9493)
   * Clean up gossiper logic for old versions (CASSANDRA-9370)


Mime
View raw message