You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/09/01 12:57:10 UTC
[4/4] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2ee6bac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2ee6bac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2ee6bac
Branch: refs/heads/trunk
Commit: c2ee6bac332c7bccf9a44e71288d9ec237865d5f
Parents: 4e57b82 07594ee
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Tue Sep 1 11:56:43 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Tue Sep 1 11:56:43 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/config/CFMetaData.java | 3 +
.../apache/cassandra/cql3/UpdateParameters.java | 2 +-
.../cassandra/db/ClusteringComparator.java | 23 ++---
.../db/marshal/AbstractCompositeType.java | 7 +-
.../cassandra/db/marshal/AbstractType.java | 102 ++++++++++++++-----
.../apache/cassandra/db/marshal/AsciiType.java | 12 +--
.../cassandra/db/marshal/BooleanType.java | 4 +-
.../apache/cassandra/db/marshal/ByteType.java | 3 +-
.../apache/cassandra/db/marshal/BytesType.java | 12 +--
.../cassandra/db/marshal/CollectionType.java | 3 +-
.../db/marshal/ColumnToCollectionType.java | 3 +-
.../cassandra/db/marshal/CounterColumnType.java | 12 +--
.../apache/cassandra/db/marshal/DateType.java | 15 +--
.../cassandra/db/marshal/DecimalType.java | 4 +-
.../apache/cassandra/db/marshal/DoubleType.java | 4 +-
.../db/marshal/DynamicCompositeType.java | 8 +-
.../apache/cassandra/db/marshal/EmptyType.java | 4 +-
.../apache/cassandra/db/marshal/FloatType.java | 4 +-
.../apache/cassandra/db/marshal/FrozenType.java | 10 +-
.../cassandra/db/marshal/InetAddressType.java | 12 +--
.../apache/cassandra/db/marshal/Int32Type.java | 3 +-
.../cassandra/db/marshal/IntegerType.java | 4 +-
.../cassandra/db/marshal/LexicalUUIDType.java | 3 +-
.../apache/cassandra/db/marshal/ListType.java | 4 +-
.../apache/cassandra/db/marshal/LongType.java | 4 +-
.../apache/cassandra/db/marshal/MapType.java | 9 +-
.../db/marshal/PartitionerDefinedOrder.java | 3 +-
.../cassandra/db/marshal/ReversedType.java | 3 +-
.../apache/cassandra/db/marshal/SetType.java | 9 +-
.../apache/cassandra/db/marshal/ShortType.java | 3 +-
.../cassandra/db/marshal/SimpleDateType.java | 14 +--
.../apache/cassandra/db/marshal/TimeType.java | 13 +--
.../cassandra/db/marshal/TimeUUIDType.java | 3 +-
.../cassandra/db/marshal/TimestampType.java | 4 +-
.../apache/cassandra/db/marshal/TupleType.java | 3 +-
.../apache/cassandra/db/marshal/UTF8Type.java | 12 +--
.../apache/cassandra/db/marshal/UUIDType.java | 3 +-
.../org/apache/cassandra/cql3/UDHelperTest.java | 6 +-
39 files changed, 159 insertions(+), 192 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2ee6bac/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a55a5af,6a0b0b6..5b80edf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
+3.2
+ * Add transparent data encryption core classes (CASSANDRA-9945)
+
+
3.0.0-beta2
+ * Require AbstractType.isByteOrderComparable declaration in constructor (CASSANDRA-9901)
* Avoid digest mismatch on upgrade to 3.0 (CASSANDRA-9554)
* Fix Materialized View builder when adding multiple MVs (CASSANDRA-10156)
* Choose better poolingOptions for protocol v4 in cassandra-stress (CASSANDRA-10182)