cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Wed, 25 Jun 2014 14:54:35 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	bin/cqlsh


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

Branch: refs/heads/cassandra-2.0
Commit: c656ffe4d32db92bd95be001745b857cc6c0962b
Parents: 94ff639 66e1e46
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Wed Jun 25 09:54:20 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Wed Jun 25 09:54:20 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c656ffe4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d23ce37,6adef97..1ff5675
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,6 +1,28 @@@
 -1.2.17
 +2.0.9
 + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
 + * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
 + * Fix native protocol CAS batches (CASSANDRA-7337)
 + * Add per-CF range read request latency metrics (CASSANDRA-7338)
 + * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 + * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 + * Swap local and global default read repair chances (CASSANDRA-7320)
 + * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 + * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 + * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 + * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 + * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 + * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 + * Add authentication support to shuffle (CASSANDRA-6484)
 + * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325)
 + * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
 + * Fix infinite loop on exception while streaming (CASSANDRA-7330)
 + * Reference sstables before populating key cache (CASSANDRA-7234)
 + * Account for range tombstones in min/max column names (CASSANDRA-7235)
 + * Improve sub range repair validation (CASSANDRA-7317)
 + * Accept subtypes for function results, type casts (CASSANDRA-6766)
 +Merged from 1.2:
 + * Expose global ColumnFamily metrics (CASSANDRA-7273)
+  * cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399)
 - * Expose global ColmunFamily metrics (CASSANDRA-7273)
   * Handle possible integer overflow in FastByteArrayOutputStream (CASSANDRA-7373)
   * cqlsh: 'ascii' values weren't formatted as text (CASSANDRA-7407)
   * cqlsh: ignore .cassandra permission errors (CASSANDRA-7266)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c656ffe4/bin/cqlsh
----------------------------------------------------------------------
diff --cc bin/cqlsh
index 5484021,bb0ffdf..360c64e
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@@ -524,9 -551,9 +524,11 @@@ class Shell(cmd.Cmd)
              self.show_line_nums = True
          self.stdin = stdin
          self.query_out = sys.stdout
 +        self.empty_lines = 0
          self.statement_error = False
 +        self.single_statement = single_statement
+         # see CASSANDRA-7399
+         cql.cqltypes.CompositeType.cql_parameterized_type = classmethod(lambda cls: "'%s'"
% cls.cass_parameterized_type_with(cls.subtypes, True))
  
      def set_expanded_cql_version(self, ver):
          ver, vertuple = full_cql_version(ver)


Mime
View raw message