Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
CHANGES.txt
pylib/cqlshlib/test/test_cqlsh_completion.py
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/604c9df8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/604c9df8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/604c9df8
Branch: refs/heads/trunk
Commit: 604c9df8832e119476642eaea23240c7ae2f82e6
Parents: 9b5af91 af6bd1b
Author: Tyler Hobbs <[email protected]>
Authored: Thu Feb 11 15:31:02 2016 -0600
Committer: Tyler Hobbs <[email protected]>
Committed: Thu Feb 11 15:31:02 2016 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/cql3handling.py | 3 +-
pylib/cqlshlib/cqlhandling.py | 2 +-
pylib/cqlshlib/test/test_cqlsh_completion.py | 145 +++++++++++++++++++---
pylib/cqlshlib/test/test_keyspace_init.cql | 35 ++++++
5 files changed, 165 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/604c9df8/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9be4f38,1a4717d..7a0357f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
-2.2.6
+3.0.4
+ * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
+ * AssertionError when listing sstable files on inconsistent disk state
(CASSANDRA-11156)
+ * Fix wrong rack counting and invalid conditions check for TokenAllocation
+ (CASSANDRA-11139)
+ * Avoid creating empty hint files (CASSANDRA-11090)
+ * Fix leak detection strong reference loop using weak reference
(CASSANDRA-11120)
+ * Configurie BatchlogManager to stop delayed tasks on shutdown
(CASSANDRA-11062)
+ * Hadoop integration is incompatible with Cassandra Driver 3.0.0
(CASSANDRA-11001)
+ * Add dropped_columns to the list of schema table so it gets handled
+ properly (CASSANDRA-11050)
+Merged from 2.2:
+ * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
* Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
* Fix SELECT on tuple relations for mixed ASC/DESC clustering order
(CASSANDRA-7281)
* (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/604c9df8/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/604c9df8/pylib/cqlshlib/test/test_cqlsh_completion.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/test/test_cqlsh_completion.py
index 88bdc22,19bd092..0f0cc4d
--- a/pylib/cqlshlib/test/test_cqlsh_completion.py
+++ b/pylib/cqlshlib/test/test_cqlsh_completion.py
@@@ -406,7 -406,7 +406,7 @@@ class TestCqlshCompletion(CqlshCompleti
'utf8_with_special_chars',
'system_traces.', 'songs',
'system_auth.', 'system_distributed.',
- 'system_schema.','system_traces.',
- 'system_traces.',
++ 'system_schema.', 'system_traces.',
'"' + self.cqlsh.keyspace + '".'],
other_choices_ok=True)
self.trycompletions('DELETE FROM twenty_rows_composite_table ',
@@@ -656,10 -655,10 +656,10 @@@
self.trycompletions(prefix + " new_table (col_a int PRIMARY KEY) WITH
compaction = "
+ "{'class': 'DateTieredCompactionStrategy', '",
choices=['base_time_seconds',
'max_sstable_age_days',
- 'timestamp_resolution', 'min_threshold',
'class', 'max_threshold',
- 'tombstone_compaction_interval',
'tombstone_threshold',
- 'enabled',
'unchecked_tombstone_compaction',
- 'max_window_size_seconds',
'only_purge_repaired_tombstones'])
+ 'timestamp_resolution', 'min_threshold',
'class', 'max_threshold',
+ 'tombstone_compaction_interval',
'tombstone_threshold',
+ 'enabled',
'unchecked_tombstone_compaction',
- 'max_window_size_seconds'])
++ 'max_window_size_seconds',
'only_purge_repaired_tombstones'])
def test_complete_in_create_columnfamily(self):
self.trycompletions('CREATE C', choices=['COLUMNFAMILY', 'CUSTOM'])
