cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Wed, 12 Mar 2014 21:44:02 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 2e227eb8b5256cebccdfdab8a9a75b02e184a7f1
Parents: 019e338 faffbf2
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Wed Mar 12 16:42:29 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Wed Mar 12 16:42:29 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                            | 13 +++++++------
 .../org/apache/cassandra/db/marshal/BooleanType.java   |  7 ++++++-
 2 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e227eb8/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 00cf087,306ef94..1ef2b93
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,13 +1,20 @@@
 -2.0.7
 - * Fix saving triggers to schema (CASSANDRA-6789)
 - * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790)
 - * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838)
 - * Fix static counter columns (CASSANDRA-6827)
 - * Restore expiring->deleted (cell) compaction optimization (CASSANDRA-6844)
 - * Fix CompactionManager.needsCleanup (CASSANDRA-6845)
 - * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779)
 -
 -2.0.6
 +2.1.0-beta2
 + * Switch CRC component to Adler and include it for compressed sstables 
 +   (CASSANDRA-4165)
 + * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451)
 + * Add broadcast_rpc_address option to cassandra.yaml (CASSANDRA-5899)
 + * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897)
 + * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573)
 + * Fix ABTC NPE (CASSANDRA-6692)
 + * Allow nodetool to use a file or prompt for password (CASSANDRA-6660)
 + * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742)
 + * Fix assertion error in ALTER TYPE RENAME (CASSANDRA-6705)
 + * Scrub should not always clear out repaired status (CASSANDRA-5351)
 + * Improve handling of range tombstone for wide partitions (CASSANDRA-6446)
 + * Fix ClassCastException for compact table with composites (CASSANDRA-6738)
 + * Fix potentially repairing with wrong nodes (CASSANDRA-6808)
 + * Change caching option syntax (CASSANDRA-6745)
 +Merged from 2.0:
-  * Fix saving triggers to schema (CASSANDRA-6789)
-  * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790)
-  * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838)
-  * Fix static counter columns (CASSANDRA-6827)
-  * Restore expiring->deleted (cell) compaction optimization (CASSANDRA-6844)
-  * Fix CompactionManager.needsCleanup (CASSANDRA-6845)
   * Avoid race-prone second "scrub" of system keyspace (CASSANDRA-6797)
   * Pool CqlRecordWriter clients by inetaddress rather than Range 
     (CASSANDRA-6665)
@@@ -61,44 -46,23 +55,51 @@@
   * Fix CQLSStableWriter.addRow(Map<String, Object>) (CASSANDRA-6526)
   * Fix HSHA server introducing corrupt data (CASSANDRA-6285)
   * Fix CAS conditions for COMPACT STORAGE tables (CASSANDRA-6813)
 -Merged from 1.2:
 - * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541)
 - * Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
 - * Fix broken streams when replacing with same IP (CASSANDRA-6622)
 - * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
 - * Fix partition and range deletes not triggering flush (CASSANDRA-6655)
 - * Fix mean cells and mean row size per sstable calculations (CASSANDRA-6667)
 - * Compact hints after partial replay to clean out tombstones (CASSANDRA-6666)
 - * Log USING TTL/TIMESTAMP in a counter update warning (CASSANDRA-6649)
 - * Don't exchange schema between nodes with different versions (CASSANDRA-6695)
 - * Use real node messaging versions for schema exchange decisions (CASSANDRA-6700)
 - * IN on the last clustering columns + ORDER BY DESC yield no results (CASSANDRA-6701)
 - * Fix SecondaryIndexManager#deleteFromIndexes() (CASSANDRA-6711)
 - * Fix snapshot repair not snapshotting coordinator itself (CASSANDRA-6713)
 - * Support negative timestamps for CQL3 dates in query string (CASSANDRA-6718)
 - * Avoid NPEs when receiving table changes for an unknown keyspace (CASSANDRA-5631)
 - * Fix bootstrapping when there is no schema (CASSANDRA-6685)
++ * Fix saving triggers to schema (CASSANDRA-6789)
++ * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790)
++ * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838)
++ * Fix static counter columns (CASSANDRA-6827)
++ * Restore expiring->deleted (cell) compaction optimization (CASSANDRA-6844)
++ * Fix CompactionManager.needsCleanup (CASSANDRA-6845)
++ * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779)
 +
 +
 +2.1.0-beta1
 + * Add flush directory distinct from compaction directories (CASSANDRA-6357)
 + * Require JNA by default (CASSANDRA-6575)
 + * add listsnapshots command to nodetool (CASSANDRA-5742)
 + * Introduce AtomicBTreeColumns (CASSANDRA-6271, 6692)
 + * Multithreaded commitlog (CASSANDRA-3578)
 + * allocate fixed index summary memory pool and resample cold index summaries 
 +   to use less memory (CASSANDRA-5519)
 + * Removed multithreaded compaction (CASSANDRA-6142)
 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 + * Remove CFDefinition (CASSANDRA-6253)
 + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
 + * User-defined types for CQL3 (CASSANDRA-5590)
 + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406)
 + * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
 + * Secondary index support for collections (CASSANDRA-4511, 6383)
 + * SSTable metadata(Stats.db) format change (CASSANDRA-6356)
 + * Push composites support in the storage engine
 +   (CASSANDRA-5417, CASSANDRA-6520)
 + * Add snapshot space used to cfstats (CASSANDRA-6231)
 + * Add cardinality estimator for key count estimation (CASSANDRA-5906)
 + * CF id is changed to be non-deterministic. Data dir/key cache are created
 +   uniquely for CF id (CASSANDRA-5202)
 + * New counters implementation (CASSANDRA-6504)
 + * Replace UnsortedColumns, EmptyColumns, TreeMapBackedSortedColumns with new
 +   ArrayBackedSortedColumns (CASSANDRA-6630, CASSANDRA-6662, CASSANDRA-6690)
 + * Add option to use row cache with a given amount of rows (CASSANDRA-5357)
 + * Avoid repairing already repaired data (CASSANDRA-5351)
 + * Reject counter updates with USING TTL/TIMESTAMP (CASSANDRA-6649)
 + * Replace index_interval with min/max_index_interval (CASSANDRA-6379)
 + * Lift limitation that order by columns must be selected for IN queries (CASSANDRA-4911)
  
  
  2.0.5


Mime
View raw message