cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [4/7] git commit: Merge
Date Fri, 04 Jan 2013 18:12:07 GMT
Merge

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/677e247b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/677e247b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/677e247b

Branch: refs/heads/trunk
Commit: 677e247bbcf0150876e94d022b8458552d9065bb
Parents: dfb3d93 3411adf
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri Jan 4 11:10:54 2013 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri Jan 4 11:10:54 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt                    |    2 +
 bin/cqlsh                      |   55 ++++++++++++++++++++++------------
 pylib/cqlshlib/cql3handling.py |   12 +++++--
 pylib/cqlshlib/cqlhandling.py  |    2 +-
 4 files changed, 46 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/677e247b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9be0991,a51864c..a960445
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -17,8 -17,8 +17,10 @@@
   * Minimize byte array allocation by AbstractData{Input,Output} (CASSANDRA-5090)
   * Add SSL support for the binary protocol (CASSANDRA-5031)
   * Allow non-schema system ks modification for shuffle to work (CASSANDRA-5097)
+  * cqlsh: Add default limit to SELECT statements (CASSANDRA-4972)
+  * cqlsh: fix DESCRIBE for 1.1 cfs in CQL3 (CASSANDRA-5101)
 +Merged from 1.1:
 + * Pig: correctly decode row keys in widerow mode (CASSANDRA-5098)
  
  
  1.2.0


Mime
View raw message