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/01/06 18:03:47 UTC
[50/50] [abbrv] cassandra git commit: Merge branch 'cassandra-3.3'
into trunk
Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a88f855
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a88f855
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a88f855
Branch: refs/heads/trunk
Commit: 9a88f8550093f1f04040d8c502e5b642169cef10
Parents: 8383e89 65b1f2d
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jan 6 18:01:49 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jan 6 18:01:49 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 5 +-
NEWS.txt | 9 +-
bin/cqlsh.py | 137 +-
conf/cassandra-env.ps1 | 3 -
conf/cassandra-env.sh | 3 -
conf/cqlshrc.sample | 17 +-
conf/jvm.options | 18 +-
debian/patches/002cassandra_logdir_fix.dpatch | 18 +-
pylib/cqlshlib/copyutil.py | 1263 +++++++++++++-----
pylib/cqlshlib/formatting.py | 96 +-
src/java/org/apache/cassandra/cql3/Cql.g | 4 +-
.../cql3/statements/BatchStatement.java | 24 +
.../org/apache/cassandra/db/ReadCommand.java | 2 +-
.../db/compaction/CompactionIterator.java | 6 +-
.../cassandra/db/partitions/PurgeFunction.java | 12 +-
.../apache/cassandra/db/rows/BufferCell.java | 2 +-
src/java/org/apache/cassandra/db/rows/Row.java | 4 +-
.../apache/cassandra/db/view/TemporalRow.java | 65 +-
.../cassandra/locator/PendingRangeMaps.java | 209 ---
.../apache/cassandra/locator/TokenMetadata.java | 61 +-
.../apache/cassandra/service/StartupChecks.java | 9 +-
.../cassandra/service/StorageService.java | 2 +-
.../test/microbench/PendingRangesBench.java | 89 --
.../org/apache/cassandra/cql3/ViewTest.java | 30 -
.../cassandra/db/compaction/TTLExpiryTest.java | 47 +-
.../cassandra/locator/PendingRangeMapsTest.java | 78 --
.../cassandra/service/ClientWarningsTest.java | 6 +-
tools/bin/cassandra-stress.bat | 2 +-
28 files changed, 1226 insertions(+), 995 deletions(-)
----------------------------------------------------------------------