Merge branch 'cassandra-3.2' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/65b1f2da Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65b1f2da Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65b1f2da Branch: refs/heads/cassandra-3.3 Commit: 65b1f2dac0701d02cd65c0526e98697c966e9560 Parents: a7854fd 85b8d02 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Jan 6 18:01:37 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Jan 6 18:01:37 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/65b1f2da/CHANGES.txt ----------------------------------------------------------------------
