You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/06/30 09:30:43 UTC
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk
* cassandra-3.9:
Avoid deserialization error after altering column type
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9242c85c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9242c85c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9242c85c
Branch: refs/heads/trunk
Commit: 9242c85cf48bbfe7e46fde180576315370c66b0c
Parents: e423527 1f014b2
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jun 30 11:16:17 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 30 11:16:17 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../apache/cassandra/db/rows/BufferCell.java | 1 -
src/java/org/apache/cassandra/db/rows/Cell.java | 16 +++----
.../cassandra/db/rows/UnfilteredSerializer.java | 30 +++++++++----
.../org/apache/cassandra/cql3/CQLTester.java | 39 +++++++++++++++--
.../cql3/validation/operations/AlterTest.java | 46 +++++++++++++-------
6 files changed, 97 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9242c85c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 81740ab,ed884a9..6068b14
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,6 +1,9 @@@
+3.10
+ * Remove pre-startup check for open JMX port (CASSANDRA-12074)
+
3.9
+ Merged from 3.0:
+ * Fix EOF exception when altering column type (CASSANDRA-11820)
Merged from 2.2:
* MemoryUtil.getShort() should return an unsigned short also for architectures not supporting unaligned memory accesses (CASSANDRA-11973)
Merged from 2.1: