cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Date Sun, 24 Mar 2013 15:04:22 GMT
Merge branch 'cassandra-1.1' into cassandra-1.2


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

Branch: refs/heads/cassandra-1.2
Commit: 08e7f4c144c1c4e0dbbad50d8676f889c4fb8aee
Parents: 2ab0c72 fa29f41
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Sun Mar 24 17:59:58 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Sun Mar 24 18:02:19 2013 +0300

----------------------------------------------------------------------
 CHANGES.txt                                      |    2 ++
 src/java/org/apache/cassandra/cli/CliClient.java |    6 +++---
 src/java/org/apache/cassandra/cli/CliUtils.java  |    6 ++++++
 3 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/08e7f4c1/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 945b64d,010bdc0..7bf455c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,40 -1,4 +1,42 @@@
 -1.1.11
 +1.2.4
 + * Change default stream throughput from 400 to 200 mbps (CASSANDRA-5036)
 + * Gossiper logs DOWN for symmetry with UP (CASSANDRA-5187)
 + * Fix mixing prepared statements between keyspaces (CASSANDRA-5352)
 + * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354)
 + * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362)
 + * Improve asynchronous hint delivery (CASSANDRA-5179)
 + * Fix Guava dependency version (12.0 -> 13.0.1) for Maven (CASSANDRA-5364)
 + * Validate that provided CQL3 collection value are < 64K (CASSANDRA-5355)
 + * Change Kernel Page Cache skipping into row preheating (disabled by default)
 +   (CASSANDRA-4937)
++Merged from 1.1:
++ * cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052)
 +
 +
 +1.2.3
 + * add check for sstable overlap within a level on startup (CASSANDRA-5327)
 + * replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328)
 + * Avoid allocating SSTableBoundedScanner during repair when the range does 
 +   not intersect the sstable (CASSANDRA-5249)
 + * Don't lowercase property map keys (this breaks NTS) (CASSANDRA-5292)
 + * Fix composite comparator with super columns (CASSANDRA-5287)
 + * Fix insufficient validation of UPDATE queries against counter cfs
 +   (CASSANDRA-5300)
 + * Fix PropertyFileSnitch default DC/Rack behavior (CASSANDRA-5285)
 + * Handle null values when executing prepared statement (CASSANDRA-5081)
 + * Add netty to pom dependencies (CASSANDRA-5181)
 + * Include type arguments in Thrift CQLPreparedResult (CASSANDRA-5311)
 + * Fix compaction not removing columns when bf_fp_ratio is 1 (CASSANDRA-5182)
 + * cli: Warn about missing CQL3 tables in schema descriptions (CASSANDRA-5309)
 + * Re-enable unknown option in replication/compaction strategies option for
 +   backward compatibility (CASSANDRA-4795)
 + * Add binary protocol support to stress (CASSANDRA-4993)
 + * cqlsh: Fix COPY FROM value quoting and null handling (CASSANDRA-5305)
 + * Fix repair -pr for vnodes (CASSANDRA-5329)
 + * Relax CL for auth queries for non-default users (CASSANDRA-5310)
 + * Fix AssertionError during repair (CASSANDRA-5245)
 + * Don't announce migrations to pre-1.2 nodes (CASSANDRA-5334)
 +Merged from 1.1:
   * Update offline scrub for 1.0 -> 1.1 directory structure (CASSANDRA-5195)
   * add tmp flag to Descriptor hashcode (CASSANDRA-4021)
   * fix logging of "Found table data in data directories" when only system tables

http://git-wip-us.apache.org/repos/asf/cassandra/blob/08e7f4c1/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/08e7f4c1/src/java/org/apache/cassandra/cli/CliUtils.java
----------------------------------------------------------------------


Mime
View raw message