cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Date Wed, 02 Dec 2015 10:30:14 GMT
Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: ac60e7dd6390fbac3027975e76e96ee9cbbb7332
Parents: 02492f7 bcdbb0e
Author: Benjamin Lerer <b.lerer@gmail.com>
Authored: Wed Dec 2 11:27:43 2015 +0100
Committer: Benjamin Lerer <b.lerer@gmail.com>
Committed: Wed Dec 2 11:27:43 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt  | 1 +
 bin/cqlsh.py | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac60e7dd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0ba19c3,1b7f3a2..a4a77ad
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Normalize cqlsh DESC output (CASSANDRA-10431)
   * Rejects partition range deletions when columns are specified (CASSANDRA-10739)
   * Fix error when saving cached key for old format sstable (CASSANDRA-10778)
   * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758)


Mime
View raw message