cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [4/6] git commit: merge from 1.2
Date Sat, 28 Dec 2013 06:17:47 GMT
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/6a211f48
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a211f48
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a211f48

Branch: refs/heads/trunk
Commit: 6a211f485f121c3e2cb2e547911cce86584a24b2
Parents: dc24122 ecbf0fd
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Sat Dec 28 00:17:16 2013 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Sat Dec 28 00:17:16 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                   | 5 +++++
 .../org/apache/cassandra/io/compress/CompressionMetadata.java | 7 ++++++-
 src/java/org/apache/cassandra/io/util/SequentialWriter.java   | 4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a211f48/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 93cdd81,6c63f9d..0396006
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,14 +1,29 @@@
 -1.2.14
 - * Allow executing CREATE statements multiple times (CASSANDRA-6471)
 - * Don't send confusing info with timeouts (CASSANDRA-6491)
 - * Don't resubmit counter mutation runnables internally (CASSANDRA-6427)
 - * Don't drop local mutations without a trace (CASSANDRA-6510)
 - * Don't allow null max_hint_window_in_ms (CASSANDRA-6419)
 - * Validate SliceRange start and finish lengths (CASSANDRA-6521)
++2.0.5
++Merged from 1.2:
+  * fsync compression metadata (CASSANDRA-6531)
+ 
+ 
 -1.2.13
 +2.0.4
 + * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418)
 + * add StorageService.stopDaemon() (CASSANDRA-4268)
 + * add IRE for invalid CF supplied to get_count (CASSANDRA-5701)
 + * add client encryption support to sstableloader (CASSANDRA-6378)
 + * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
 + * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
 + * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
 + * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)
 + * Fix cleanup ClassCastException (CASSANDRA-6462)
 + * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410)
 + * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)
 + * Fix divide-by-zero in PCI (CASSANDRA-6403)
 + * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
 + * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395)
 + * Expose a total memtable size metric for a CF (CASSANDRA-6391)
 + * cqlsh: handle symlinks properly (CASSANDRA-6425)
 + * Fix potential infinite loop when paging query with IN (CASSANDRA-6464)
 + * Fix assertion error in AbstractQueryPager.discardFirst (CASSANDRA-6447)
 + * Fix streaming older SSTable yields unnecessary tombstones (CASSANDRA-6527)
 +Merged from 1.2:
   * Improved error message on bad properties in DDL queries (CASSANDRA-6453)
   * Randomize batchlog candidates selection (CASSANDRA-6481)
   * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a211f48/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a211f48/src/java/org/apache/cassandra/io/util/SequentialWriter.java
----------------------------------------------------------------------


Mime
View raw message