cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mish...@apache.org
Subject [5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Thu, 08 May 2014 20:45:43 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/355e69b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/355e69b7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/355e69b7

Branch: refs/heads/cassandra-2.1
Commit: 355e69b7ff36d52c87522cd037ad10a85c62da13
Parents: a0d096b a626c6d
Author: Mikhail Stepura <mishail@apache.org>
Authored: Thu May 8 13:45:22 2014 -0700
Committer: Mikhail Stepura <mishail@apache.org>
Committed: Thu May 8 13:45:22 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                    | 1 +
 pylib/cqlshlib/cql3handling.py | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/355e69b7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2d9ce55,ce30239..6d80937
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -16,6 -5,24 +16,7 @@@ Merged from 2.0
   * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162)
   * Fix disabling autocompaction (CASSANDRA-7187)
   * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088)
+  * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185)
 -
 -2.0.8
 - * Correctly delete scheduled range xfers (CASSANDRA-7143)
 - * Make batchlog replica selection rack-aware (CASSANDRA-6551)
 - * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
 - * Set JMX RMI port to 7199 (CASSANDRA-7087)
 - * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
 - * Log a warning for large batches (CASSANDRA-6487)
 - * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
 - * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
 - * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
 - * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
 - * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
 - * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073)
 - * Re-add parameter columns to tracing session (CASSANDRA-6942)
 - * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
 - * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)
   * Update system.peers correctly when relocating tokens (CASSANDRA-7126)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/355e69b7/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/cql3handling.py
index 230fa91,9b78638..14b3dba
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@@ -74,11 -79,9 +74,11 @@@ class Cql3ParsingRuleSet(CqlParsingRule
          # (CQL3 option name, schema_columnfamilies column name (or None if same),
          #  list of known map keys)
          ('compaction', 'compaction_strategy_options',
-             ('class', 'min_threshold', 'max_threshold')),
+             ('class', 'max_threshold', 'tombstone_compaction_interval', 'tombstone_threshold',
'enabled')),
          ('compression', 'compression_parameters',
              ('sstable_compression', 'chunk_length_kb', 'crc_check_chance')),
 +        ('caching', None,
 +            ('rows_per_partition', 'keys')),
      )
  
      obsolete_cf_options = ()


Mime
View raw message