You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/08/18 21:02:32 UTC
[1/4] git commit: (cqlsh) enable CTRL-R history search with libedit
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 77f6c25e6 -> 69abfaaec
(cqlsh) enable CTRL-R history search with libedit
patch by Aleksey Yeschenko; reviewed by Jeremiah Jordan for
CASSANDRA-7577
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36382e54
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36382e54
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36382e54
Branch: refs/heads/cassandra-2.1
Commit: 36382e54721d0ba615f94045aa4e8d507928ae70
Parents: 384d4f0
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Aug 18 21:52:19 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Aug 18 21:52:19 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36382e54/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4b1becc..6c2ba2c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.10
+ * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
* Fix dropping collection when it's the last regular column (CASSANDRA-7744)
* Properly reject operations on list index with conditions (CASSANDRA-7499)
* (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36382e54/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 64d7bf5..c99b98c 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -741,6 +741,7 @@ class Shell(cmd.Cmd):
if readline.__doc__ is not None and 'libedit' in readline.__doc__:
readline.parse_and_bind("bind -e")
readline.parse_and_bind("bind '" + self.completekey + "' rl_complete")
+ readline.parse_and_bind("bind ^R em-inc-search-prev")
else:
readline.parse_and_bind(self.completekey + ": complete")
try:
[4/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by al...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/69abfaae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69abfaae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69abfaae
Branch: refs/heads/cassandra-2.1
Commit: 69abfaaecf73fe47139656c7726170a2701b528c
Parents: bc16517 fabdd43
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Aug 18 22:01:01 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Aug 18 22:01:01 2014 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by al...@apache.org.
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/bc165174
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc165174
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc165174
Branch: refs/heads/cassandra-2.1
Commit: bc165174b0920b7c494345dc988c3a4b9984ed77
Parents: 77f6c25 36382e5
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Aug 18 21:59:31 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Aug 18 21:59:31 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 2 ++
bin/cqlsh | 1 +
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc165174/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9ab4109,6c2ba2c..6160b04
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,63 -1,15 +1,65 @@@
-2.0.10
+2.1.1
+ * Support list index operations with conditions (CASSANDRA-7499)
+ * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
+ * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
+ * (cqlsh) Error when tracing query (CASSANDRA-7613)
+ * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
+ * SSTableExport uses correct validator to create string representation of partition
+ keys (CASSANDRA-7498)
+ * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689)
+ * Add support for custom 2i validation (CASSANDRA-7575)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+Merged from 2.0:
+ * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
- * Fix dropping collection when it's the last regular column (CASSANDRA-7744)
- * Properly reject operations on list index with conditions (CASSANDRA-7499)
* (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
- * (cqlsh) Wait up to 10 sec for a tracing session (CASSANDRA-7222)
- * Fix NPE in FileCacheService.sizeInBytes (CASSANDRA-7756)
* (cqlsh) cqlsh should automatically disable tracing when selecting
from system_traces (CASSANDRA-7641)
* (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
* Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
* (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
+ * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
+ * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
+ * cqlsh fails when version number parts are not int (CASSANDRA-7524)
+
++
+2.1.0
+ * Fix ordering of static cells (CASSANDRA-7763)
+Merged from 2.0:
+ * Fix dropping collection when it's the last regular column (CASSANDRA-7744)
+ * Properly reject operations on list index with conditions (CASSANDRA-7499)
+ * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
+
+
+2.1.0-rc6
+ * Fix OOM issue from netty caching over time (CASSANDRA-7743)
+ * json2sstable couldn't import JSON for CQL table (CASSANDRA-7477)
+ * Invalidate all caches on table drop (CASSANDRA-7561)
+ * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765)
+ * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
+ * Add tracing entries about concurrent range requests (CASSANDRA-7599)
+ * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
+ * Remove netty buffer ref-counting (CASSANDRA-7735)
+ * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
+ * Include stress yaml example in release and deb (CASSANDRA-7717)
+ * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695)
+ * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
+ * Fix binding null values inside UDT (CASSANDRA-7685)
+ * Fix UDT field selection with empty fields (CASSANDRA-7670)
+ * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
+ * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770)
+Merged from 2.0:
+ * (cqlsh) Wait up to 10 sec for a tracing session (CASSANDRA-7222)
+ * Fix NPE in FileCacheService.sizeInBytes (CASSANDRA-7756)
+ * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
+ * Clone token map outside of hot gossip loops (CASSANDRA-7758)
* Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
* Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
* Give CRR a default input_cql Statement (CASSANDRA-7226)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc165174/bin/cqlsh
----------------------------------------------------------------------
[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fabdd431
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fabdd431
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fabdd431
Branch: refs/heads/cassandra-2.1
Commit: fabdd431ae9cda53b6a274bff4644dd467a5a392
Parents: 055b896 36382e5
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Aug 18 22:00:40 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Aug 18 22:00:40 2014 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------