cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [5/5] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.3
Date Wed, 13 Jan 2016 13:53:36 GMT
Merge branch cassandra-3.0 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/cf3dcc2b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf3dcc2b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf3dcc2b

Branch: refs/heads/cassandra-3.3
Commit: cf3dcc2bb267fefc591e9167c02168cdc65bb500
Parents: 0693db7 95012da
Author: Benjamin Lerer <b.lerer@gmail.com>
Authored: Wed Jan 13 14:53:03 2016 +0100
Committer: Benjamin Lerer <b.lerer@gmail.com>
Committed: Wed Jan 13 14:53:03 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf3dcc2b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index dfa073b,38786c1..fd05c01
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -7,27 -4,6 +7,28 @@@ Merged from 3.0
     tombstone (CASSANDRA-10743)
   * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
   * Fix potential assertion error during compaction (CASSANDRA-10944)
 +Merged from 2.2:
 + * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
 + * Enable GC logging by default (CASSANDRA-10140)
 + * Optimize pending range computation (CASSANDRA-9258)
 + * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
 + * drop/alter user should be case sensitive (CASSANDRA-10817)
 +Merged from 2.1:
++ * (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
 + * Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)
 + * If CompactionMetadata is not in stats file, use index summary instead (CASSANDRA-10676)
 + * Retry sending gossip syn multiple times during shadow round (CASSANDRA-8072)
 + * Fix pending range calculation during moves (CASSANDRA-10887)
 + * Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-8708)
 +
 +
 +3.2
 + * Make sure tokens don't exist in several data directories (CASSANDRA-6696)
 + * Add requireAuthorization method to IAuthorizer (CASSANDRA-10852)
 + * Move static JVM options to conf/jvm.options file (CASSANDRA-10494)
 + * Fix CassandraVersion to accept x.y version string (CASSANDRA-10931)
 + * Add forceUserDefinedCleanup to allow more flexible cleanup (CASSANDRA-10708)
 + * (cqlsh) allow setting TTL with COPY (CASSANDRA-9494)
   * Fix counting of received sstables in streaming (CASSANDRA-10949)
   * Implement hints compression (CASSANDRA-9428)
   * Fix potential assertion error when reading static columns (CASSANDRA-10903)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf3dcc2b/bin/cqlsh.py
----------------------------------------------------------------------


Mime
View raw message