cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [06/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Fri, 02 May 2014 20:52:14 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0

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

Branch: refs/heads/cassandra-2.0
Commit: 238a0208440c4452241fb60e10053bb6c71a56db
Parents: 62af7d0 562a22f
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri May 2 15:47:10 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri May 2 15:47:10 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                               | 2 ++
 src/java/org/apache/cassandra/service/StorageService.java | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/238a0208/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0a43f10,1c67331..9ab1a5f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,6 +1,20 @@@
 -1.2.17
 - * Update system.peers correctly when relocating tokens (CASSANDRA-7126)
 +2.0.8
++=======
   * Add Google Compute Engine snitch (CASSANDRA-7132)
 + * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
 + * Set JMX RMI port to 7199 (CASSANDRA-7087)
 + * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
 + * Log a warning for large batches (CASSANDRA-6487)
 + * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
 + * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
 + * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
 + * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
 + * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
 + * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073)
 + * Re-add parameter columns to tracing session (CASSANDRA-6942)
 + * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
 +Merged from 1.2:
++ * Update system.peers correctly when relocating tokens (CASSANDRA-7126)
   * Fix nodetool display with vnodes (CASSANDRA-7082)
   * Fix schema concurrency exceptions (CASSANDRA-6841)
   * Fix BatchlogManager#deleteBatch() use of millisecond timsestamps

http://git-wip-us.apache.org/repos/asf/cassandra/blob/238a0208/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message