cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [01/11] git commit: merge from 1.2
Date Tue, 24 Sep 2013 15:48:08 GMT
Updated Branches:
  refs/heads/cassandra-1.2 fa8d92312 -> 546485310
  refs/heads/cassandra-2.0 424206a15 -> 07638f41a
  refs/heads/trunk 938e6989a -> 2fea9fab0


merge from 1.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f3dddb3b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3dddb3b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3dddb3b

Branch: refs/heads/cassandra-2.0
Commit: f3dddb3bd5e0332717d36d40effba363dd230853
Parents: 7c6e552 bb3ec4c
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Sep 24 10:14:04 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Sep 24 10:14:04 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  3 +++
 src/java/org/apache/cassandra/gms/Gossiper.java | 20 ++++++++++++++++----
 .../apache/cassandra/service/StorageProxy.java  |  3 ++-
 3 files changed, 21 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3dddb3b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1bdb6a8,ae2ab5e..54b2e9e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,49 -1,13 +1,52 @@@
 -1.2.11
 +2.0.2
 + * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
 + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
 + * Fix insertion of collections with CAS (CASSANDRA-6069)
 +Merged from 1.2:
+  * Avoid sending Truncate command to fat clients (CASSANDRA-6088)
+  * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
   * Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
   * Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
   * Move batchlog replay to its own executor (CASSANDRA-6079)
   * Add tombstone debug threshold and histogram (CASSANDRA-6042, 6057)
 + * Enable tcp keepalive on incoming connections (CASSANDRA-4053)
  
+ 
 -1.2.10
 +2.0.1
 + * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025)
 + * Improve memory use defaults (CASSANDRA-5069)
 + * Make ThriftServer more easlly extensible (CASSANDRA-6058)
 + * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
 + * add file_cache_size_in_mb setting (CASSANDRA-5661)
 + * Improve error message when yaml contains invalid properties (CASSANDRA-5958)
 + * Improve leveled compaction's ability to find non-overlapping L0 compactions
 +   to work on concurrently (CASSANDRA-5921)
 + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
 + * Log Merkle tree stats (CASSANDRA-2698)
 + * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862)
 + * Improve offheap memcpy performance (CASSANDRA-5884)
 + * Use a range aware scanner for cleanup (CASSANDRA-2524)
 + * Cleanup doesn't need to inspect sstables that contain only local data
 +   (CASSANDRA-5722)
 + * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
 + * Improve native protocol serialization (CASSANDRA-5664)
 + * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
 + * Require superuser status for adding triggers (CASSANDRA-5963)
 + * Make standalone scrubber handle old and new style leveled manifest
 +   (CASSANDRA-6005)
 + * Fix paxos bugs (CASSANDRA-6012, 6013, 6023)
 + * Fix paged ranges with multiple replicas (CASSANDRA-6004)
 + * Fix potential AssertionError during tracing (CASSANDRA-6041)
 + * Fix NPE in sstablesplit (CASSANDRA-6027)
 + * Migrate pre-2.0 key/value/column aliases to system.schema_columns
 +   (CASSANDRA-6009)
 + * Paging filter empty rows too agressively (CASSANDRA-6040)
 + * Support variadic parameters for IN clauses (CASSANDRA-4210)
 + * cqlsh: return the result of CAS writes (CASSANDRA-5796)
 + * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
 + * Support named bind variables in CQL (CASSANDRA-6033)
 +Merged from 1.2:
 + * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
   * Avoid second-guessing out-of-space state (CASSANDRA-5605)
   * Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
   * (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3dddb3b/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3dddb3b/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------


Mime
View raw message