You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/12/18 01:04:45 UTC
[1/2] cassandra git commit: cqlsh: fix CONSISTENCY output
Repository: cassandra
Updated Branches:
refs/heads/trunk 3c955f447 -> ba6e4239e
cqlsh: fix CONSISTENCY output
Patch by Adam Holmberg; reviewed by Tyler Hobbs for CASSANDRA-8507
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c8b4d956
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8b4d956
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8b4d956
Branch: refs/heads/trunk
Commit: c8b4d9568e866e50c6221475a664b6187437a123
Parents: f1e2fed
Author: Adam Holmberg <Ad...@datastax.com>
Authored: Wed Dec 17 18:03:34 2014 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Dec 17 18:03:34 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8b4d956/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ecb592e..e0652af 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.3
+ * (cqlsh) Fix output of CONSISTENCY command (CASSANDRA-8507)
* (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370)
* Make sstablescrub check leveled manifest again (CASSANDRA-8432)
* Check first/last keys in sstable when giving out positions (CASSANDRA-8458)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8b4d956/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 033eb37..a714f48 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -1720,7 +1720,7 @@ class Shell(cmd.Cmd):
"""
level = parsed.get_binding('level')
if level is None:
- print 'Current consistency level is %s.' % (self.consistency_level)
+ print 'Current consistency level is %s.' % (cassandra.ConsistencyLevel.value_to_name[self.consistency_level])
return
self.consistency_level = cassandra.ConsistencyLevel.name_to_value[level.upper()]
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba6e4239
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba6e4239
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba6e4239
Branch: refs/heads/trunk
Commit: ba6e4239ec64c2290631a525d2e4cdd75e4d9aa7
Parents: 3c955f4 c8b4d95
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed Dec 17 18:04:33 2014 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Dec 17 18:04:33 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba6e4239/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8780f0d,e0652af..d35112e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,5 +1,47 @@@
+3.0
+ * Modernize schema tables (CASSANDRA-8261)
+ * Support for user-defined aggregation functions (CASSANDRA-8053)
+ * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
+ * Refactor SelectStatement, return IN results in natural order instead
+ of IN value list order (CASSANDRA-7981)
+ * Support UDTs, tuples, and collections in user-defined
+ functions (CASSANDRA-7563)
+ * Fix aggregate fn results on empty selection, result column name,
+ and cqlsh parsing (CASSANDRA-8229)
+ * Mark sstables as repaired after full repair (CASSANDRA-7586)
+ * Extend Descriptor to include a format value and refactor reader/writer apis (CASSANDRA-7443)
+ * Integrate JMH for microbenchmarks (CASSANDRA-8151)
+ * Keep sstable levels when bootstrapping (CASSANDRA-7460)
+ * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838)
+ * Support for aggregation functions (CASSANDRA-4914)
+ * Remove cassandra-cli (CASSANDRA-7920)
+ * Accept dollar quoted strings in CQL (CASSANDRA-7769)
+ * Make assassinate a first class command (CASSANDRA-7935)
+ * Support IN clause on any clustering column (CASSANDRA-4762)
+ * Improve compaction logging (CASSANDRA-7818)
+ * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929,
+ 7924, 7812, 8063, 7813)
+ * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7028)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+ * Shorten SSTable path (CASSANDRA-6962)
+ * Use unsafe mutations for most unit tests (CASSANDRA-6969)
+ * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
+ * Fail on very large batch sizes (CASSANDRA-8011)
+ * Improve concurrency of repair (CASSANDRA-6455, 8208)
+
+
2.1.3
+ * (cqlsh) Fix output of CONSISTENCY command (CASSANDRA-8507)
* (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370)
* Make sstablescrub check leveled manifest again (CASSANDRA-8432)
* Check first/last keys in sstable when giving out positions (CASSANDRA-8458)